Fixed size issues with Datamatrix barcodes.

This commit is contained in:
Jim Evins
2017-05-14 14:44:13 -04:00
parent 629c32b90f
commit 720c904d2f
+1 -11
View File
@@ -128,22 +128,12 @@ namespace glbarcode
double minW = MIN_CELL_SIZE*encodedData.nx() + 2*MIN_CELL_SIZE; double minW = MIN_CELL_SIZE*encodedData.nx() + 2*MIN_CELL_SIZE;
double minH = MIN_CELL_SIZE*encodedData.ny() + 2*MIN_CELL_SIZE; double minH = MIN_CELL_SIZE*encodedData.ny() + 2*MIN_CELL_SIZE;
if ( (w <= minW) && (h <= minH) ) if ( (w <= minW) || (h <= minH) )
{ {
scale = 1; scale = 1;
w = minW; w = minW;
h = minH; h = minH;
} }
else if ( w <= minW )
{
scale = h / minH;
w = scale * minW;
}
else if ( h <= minH )
{
scale = w / minW;
h = scale * minH;
}
else else
{ {
scale = std::min( w / minW, h / minH ); scale = std::min( w / minW, h / minH );