diff options
author | tomsmeding <tom.smeding@gmail.com> | 2016-10-08 13:46:59 +0200 |
---|---|---|
committer | tomsmeding <tom.smeding@gmail.com> | 2016-10-08 13:52:05 +0200 |
commit | 00c059d4554f70fc52d94ff1d5dd28976bf857fb (patch) | |
tree | 40d5ddc83133892a87503b370bebf2cb9990ebef /base64.cpp | |
parent | 264fb4b2bb5480a28646a8465013647b2e034cf4 (diff) |
Code cleanup
Diffstat (limited to 'base64.cpp')
-rw-r--r-- | base64.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -1,3 +1,4 @@ +#include <cstdint> #include "base64.h" using namespace std; @@ -25,7 +26,7 @@ namespace Base64{ string res(4*blocks+4*(sz%3!=0),'\0'); int x; for(int i=0;i<blocks;i++){ - x=((unsigned char)data[3*i]<<16)|((unsigned char)data[3*i+1]<<8)|(unsigned char)data[3*i+2]; + x=((uint8_t)data[3*i]<<16)|((uint8_t)data[3*i+1]<<8)|(uint8_t)data[3*i+2]; res[4*i+3]=alphabet[x&0x3f]; x>>=6; res[4*i+2]=alphabet[x&0x3f]; x>>=6; res[4*i+1]=alphabet[x&0x3f]; x>>=6; @@ -33,16 +34,16 @@ namespace Base64{ } switch(sz%3){ case 1: - res[4*blocks+0]=alphabet[(unsigned char)data[3*blocks]>>2]; - res[4*blocks+1]=alphabet[((unsigned char)data[3*blocks]&0x3)<<4]; + res[4*blocks+0]=alphabet[(uint8_t)data[3*blocks]>>2]; + res[4*blocks+1]=alphabet[((uint8_t)data[3*blocks]&0x3)<<4]; res[4*blocks+2]='='; res[4*blocks+3]='='; break; case 2: - res[4*blocks+0]=alphabet[(unsigned char)data[3*blocks]>>2]; - res[4*blocks+1]=alphabet[(((unsigned char)data[3*blocks]&0x3)<<4)|((unsigned char)data[3*blocks+1]>>4)]; - res[4*blocks+2]=alphabet[(((unsigned char)data[3*blocks+1]&0xf)<<2)]; + res[4*blocks+0]=alphabet[(uint8_t)data[3*blocks]>>2]; + res[4*blocks+1]=alphabet[(((uint8_t)data[3*blocks]&0x3)<<4)|((uint8_t)data[3*blocks+1]>>4)]; + res[4*blocks+2]=alphabet[(((uint8_t)data[3*blocks+1]&0xf)<<2)]; res[4*blocks+3]='='; break; } |