Scarfski/assimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into kimkulling_dev

Browse Source
This commit is contained in:
Kim Kulling
2020-01-18 14:05:51 +01:00
committed by GitHub
parent 783430667b e0571329e7
commit c4d98ced49
19 changed files with 263 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/Assjson/cencode.c
View File

@@ -45,7 +45,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
{
state_in->result = result;
state_in->step = step_A;
return codechar - code_out;
return (int)(codechar - code_out);
}
fragment = *plainchar++;
result = (fragment & 0x0fc) >> 2;
@@ -56,7 +56,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
{
state_in->result = result;
state_in->step = step_B;
return codechar - code_out;
return (int)(codechar - code_out);
}
fragment = *plainchar++;
result |= (fragment & 0x0f0) >> 4;
@@ -67,7 +67,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
{
state_in->result = result;
state_in->step = step_C;
return codechar - code_out;
return (int)(codechar - code_out);
}
fragment = *plainchar++;
result |= (fragment & 0x0c0) >> 6;
@@ -84,7 +84,7 @@ int base64_encode_block(const char* plaintext_in, int length_in, char* code_out,
}
}
/* control should not reach here */
return codechar - code_out;
return (int)(codechar - code_out);
}
int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
@@ -107,7 +107,7 @@ int base64_encode_blockend(char* code_out, base64_encodestate* state_in)
}
*codechar++ = '\n';
return codechar - code_out;
return (int)(codechar - code_out);
}
#pragma warning(pop)