decode64: remove padding zeros (#5657)

Author: Fedr

source/MRMesh/MRBase64.cpp

@@ -18,15 +18,21 @@ std::string encode64( const std::uint8_t * data, size_t size )
     return tmp;
 }
 
-std::vector<std::uint8_t> decode64( const std::string &val ) 
+std::vector<std::uint8_t> decode64( const std::string &val )
 {
     MR_TIMER;
     using namespace boost::archive::iterators;
     using It = transform_width<binary_from_base64<std::string::const_iterator>, 8, 6>;
     #pragma warning(push)
         #pragma warning(disable:4127)
-        return std::vector<std::uint8_t>( It( begin( val ) ), It( end( val ) ) );
+        auto res = std::vector<std::uint8_t>( It( begin( val ) ), It( end( val ) ) );
     #pragma warning(pop)
+    // remove padding zeros
+    if ( !res.empty() && !val.empty() && val.back() == '=' )
+        res.pop_back();
+    if ( !res.empty() && val.size() >= 2 && val[val.size() - 2] == '=' )
+        res.pop_back();
+    return res;
 }
 
 } //namespace MR

source/MRTest/MRBase64Tests.cpp

@@ -0,0 +1,22 @@
+#include <MRMesh/MRBase64.h>
+#include <MRMesh/MRGTest.h>
+
+namespace MR
+{
+
+TEST( MRMesh, Base64 )
+{
+    EXPECT_EQ( decode64( "d29y" ), ( std::vector<std::uint8_t>{ 'w', 'o', 'r' } ) );
+    EXPECT_EQ( decode64( "d28" ),  ( std::vector<std::uint8_t>{ 'w', 'o' } ) );
+    EXPECT_EQ( decode64( "d28=" ), ( std::vector<std::uint8_t>{ 'w', 'o' } ) );
+    EXPECT_EQ( decode64( "dw" ),   ( std::vector<std::uint8_t>{ 'w' } ) );
+    EXPECT_EQ( decode64( "dw==" ), ( std::vector<std::uint8_t>{ 'w' } ) );
+    EXPECT_EQ( decode64( "" ),     ( std::vector<std::uint8_t>{} ) );
+
+    EXPECT_EQ( "d29y", encode64( (const std::uint8_t*)"wor", 3 ) );
+    EXPECT_EQ( "d28=", encode64( (const std::uint8_t*)"wo", 2 ) );
+    EXPECT_EQ( "dw==", encode64( (const std::uint8_t*)"w", 1 ) );
+    EXPECT_EQ( "",     encode64( (const std::uint8_t*)"", 0 ) );
+}
+
+} //namespace MR

source/MRTest/BendTextAlongCurveTests.cpp …rce/MRTest/MRBendTextAlongCurveTests.cppsource/MRTest/BendTextAlongCurveTests.cpp renamed to source/MRTest/MRBendTextAlongCurveTests.cpp source/MRTest/BendTextAlongCurveTests.cpp renamed to source/MRTest/MRBendTextAlongCurveTests.cpp

@@ -12,6 +12,7 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="MRAABBTreePointsTests.cpp" />
+    <ClCompile Include="MRBase64Tests.cpp" />
     <ClCompile Include="MRBestFitTests.cpp" />
     <ClCompile Include="MRBezierTests.cpp" />
     <ClCompile Include="MRBitSetTests.cpp" />
@@ -61,7 +62,7 @@
     <ClCompile Include="MRCylinderApproximation.cpp" />
     <ClCompile Include="MRSolidOfRevolution.cpp" />
     <ClCompile Include="MRFillingSurface.cpp" />
-    <ClCompile Include="BendTextAlongCurveTests.cpp" />
+    <ClCompile Include="MRBendTextAlongCurveTests.cpp" />
     <ClCompile Include="MRFormatTests.cpp" />
   </ItemGroup>
   <ItemGroup>

source/MRTest/MRTest.vcxproj

@@ -154,7 +154,7 @@
     <ClCompile Include="MRDicomTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="BendTextAlongCurveTests.cpp">
+    <ClCompile Include="MRBendTextAlongCurveTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="MRFormatTests.cpp">
@@ -163,6 +163,9 @@
     <ClCompile Include="MRMeshCollideTests.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="MRBase64Tests.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\.editorconfig" />