Merge pull request #6 from FrancisJC/patch-1

delete barcodeFormatString_2

Author: DMGithubPublisher

samples/C++/GeneralSettings/GeneralSettings.cpp

@@ -82,10 +82,8 @@ int main()
             cout << "Result " << (i + 1) << ":" << endl;
 
             // 5.1. Get format of each barcode
-            if (barcodeResults->results[i]->barcodeFormat != BF_NULL)
-                cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
-            else
-                cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString_2 << endl;
+            cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
+
 
             // 5.2. Get text result of each barcode
             cout << "    Barcode Text: " << barcodeResults->results[i]->barcodeText << endl;

samples/C++/Performance/AccuracyFirstSettings/AccuracyFirstSettings.cpp

@@ -61,10 +61,7 @@ class AccuracyFirstSettings {
 				cout << "Result " << (i + 1) << ":" << endl;
 
 				// Get format of each barcode
-				if (barcodeResults->results[i]->barcodeFormat != BF_NULL)
-					cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
-				else
-					cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString_2 << endl;
+				cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
 
 				// Get text result of each barcode
 				cout << "    Barcode Text: " << barcodeResults->results[i]->barcodeText << endl;

samples/C++/Performance/BatchDecode/DbrBarcodeFileReader.cpp

@@ -152,14 +152,7 @@ bool CDbrBarcodeFileReader::ReadFileBarcodes(const string strFilePath, CBarcodeS
 	{
 		CBarcodeStatisticsRecorder::BCODE_VALUE bcodeValue;
 		bcodeValue.strTextMessage = (pTextResultArray)->results[i]->barcodeText;
-		if ((pTextResultArray)->results[i]->barcodeFormat != 0)
-		{
-			bcodeValue.strCodeFormat = (pTextResultArray)->results[i]->barcodeFormatString;
-		}
-		else
-		{
-			bcodeValue.strCodeFormat = (pTextResultArray)->results[i]->barcodeFormatString_2;
-		}
+		bcodeValue.strCodeFormat = (pTextResultArray)->results[i]->barcodeFormatString;
 		unsigned char* tempByte = (pTextResultArray)->results[i]->barcodeBytes;
 		int byteLength = (pTextResultArray)->results[i]->barcodeBytesLength;
 		bcodeValue.strHexMessage = ToHexString(tempByte, byteLength);

samples/C++/Performance/ReadRateFirstSettings/ReadRateFirstSettings.cpp

@@ -101,10 +101,7 @@ class ReadRateFirstSettings
 				cout << "Result " << (i + 1) << ":" << endl;
 
 				//Get format of each barcode
-				if (barcodeResults->results[i]->barcodeFormat != BF_NULL)
-					cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
-				else
-					cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString_2 << endl;
+				cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
 
 				//Get text result of each barcode
 				cout << "    Barcode Text: " << barcodeResults->results[i]->barcodeText << endl;

samples/C++/Performance/SpeedFirstSettings/SpeedFirstSettings.cpp

@@ -113,10 +113,7 @@ class SpeedFirstSettings {
 				cout << "Result " << (i + 1) << ":" << endl;
 
 				//Get format of each barcode
-				if (barcodeResults->results[i]->barcodeFormat != BF_NULL)
-					cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
-				else
-					cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString_2 << endl;
+				cout << "    Barcode Format: " << barcodeResults->results[i]->barcodeFormatString << endl;
 
 				//Get text result of each barcode
 				cout << "    Barcode Text: " << barcodeResults->results[i]->barcodeText << endl;

samples/C/GeneralSettings/GeneralSettings.c

@@ -82,10 +82,7 @@ void main()
             printf("Result %d:\r\n", (index + 1));
 
             // 5.1. Get format of each barcode
-            if (barcodeResults->results[index]->barcodeFormat != BF_NULL)
-                printf("    Barcode Format: %s\r\n", barcodeResults->results[index]->barcodeFormatString);
-            else
-                printf("    Barcode Format: %s\r\n", barcodeResults->results[index]->barcodeFormatString_2);
+            printf("    Barcode Format: %s\r\n", barcodeResults->results[index]->barcodeFormatString);
 
             // 5.2. Get text result of each barcode
             printf("    Barcode Text: %s\r\n", barcodeResults->results[index]->barcodeText);

samples/C/HelloWorld/HelloWorld.c

@@ -54,10 +54,7 @@ void main()
             printf("Result %d:\r\n", (index + 1));
 
             // 4.1. Get format of each barcode
-            if (barcodeResults->results[index]->barcodeFormat != BF_NULL)
-                printf("    Barcode Format: %s\r\n", barcodeResults->results[index]->barcodeFormatString);
-            else
-                printf("    Barcode Format: %s\r\n", barcodeResults->results[index]->barcodeFormatString_2);
+            printf("    Barcode Format: %s\r\n", barcodeResults->results[index]->barcodeFormatString);
 
             // 4.2. Get text result of each barcode
             printf("    Barcode Text: %s\r\n", barcodeResults->results[index]->barcodeText);