From c6c656a9f7d3ca1cdf48c48f6c263ee0980872c2 Mon Sep 17 00:00:00 2001
From: daniel_peintner <daniel_peintner@d9f2db14-54d0-4bde-b00c-16405c910529>
Date: Mon, 4 Sep 2017 13:12:44 +0000
Subject: [PATCH] fix issue with #defines pointing to wrong ISO version (ISO2
 instead of ISO1)

git-svn-id: https://svn.code.sf.net/p/openv2g/code/trunk@102 d9f2db14-54d0-4bde-b00c-16405c910529
---
 src/iso1/iso1EXIDatatypes.c        | 4 ++--
 src/iso1/iso1EXIDatatypes.h        | 8 ++++----
 src/iso1/iso1EXIDatatypesDecoder.c | 8 ++++----
 src/iso1/iso1EXIDatatypesDecoder.h | 8 ++++----
 src/iso1/iso1EXIDatatypesEncoder.c | 8 ++++----
 src/iso1/iso1EXIDatatypesEncoder.h | 8 ++++----
 6 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/iso1/iso1EXIDatatypes.c b/src/iso1/iso1EXIDatatypes.c
index f36b2a2..87a0bf7 100644
--- a/src/iso1/iso1EXIDatatypes.c
+++ b/src/iso1/iso1EXIDatatypes.c
@@ -38,7 +38,7 @@
 #ifndef EXI_iso1_DATATYPES_C
 #define EXI_iso1_DATATYPES_C
 
-#if DEPLOY_ISO2_CODEC == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC == SUPPORT_YES
 
 
 void init_iso1EXIDocument(struct iso1EXIDocument* exiDoc) {
@@ -982,7 +982,7 @@ void init_iso1PhysicalValueType(struct iso1PhysicalValueType* iso1PhysicalValueT
 
 
 
-#endif /* DEPLOY_ISO2_CODEC */
+#endif /* DEPLOY_ISO1_CODEC */
 
 #endif
 
diff --git a/src/iso1/iso1EXIDatatypes.h b/src/iso1/iso1EXIDatatypes.h
index f024fe5..d0ba97b 100644
--- a/src/iso1/iso1EXIDatatypes.h
+++ b/src/iso1/iso1EXIDatatypes.h
@@ -44,10 +44,10 @@ extern "C" {
 
 #define SUPPORT_YES 1
 #define SUPPORT_NO 2
-#define DEPLOY_ISO2_CODEC SUPPORT_NO
-#define DEPLOY_ISO2_CODEC_FRAGMENT SUPPORT_YES
+#define DEPLOY_ISO1_CODEC SUPPORT_NO
+#define DEPLOY_ISO1_CODEC_FRAGMENT SUPPORT_YES
 
-#if DEPLOY_ISO2_CODEC == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC == SUPPORT_YES
 
 #include <stdint.h>
 
@@ -2922,7 +2922,7 @@ void init_iso1TransformType(struct iso1TransformType* iso1TransformType);
 void init_iso1PhysicalValueType(struct iso1PhysicalValueType* iso1PhysicalValueType);
 
 
-#endif /* DEPLOY_ISO2_CODEC */
+#endif /* DEPLOY_ISO1_CODEC */
 
 #ifdef __cplusplus
 }
diff --git a/src/iso1/iso1EXIDatatypesDecoder.c b/src/iso1/iso1EXIDatatypesDecoder.c
index 995f0a1..ed5e6cd 100644
--- a/src/iso1/iso1EXIDatatypesDecoder.c
+++ b/src/iso1/iso1EXIDatatypesDecoder.c
@@ -41,7 +41,7 @@
 #ifndef EXI_iso1_DATATYPES_DECODER_C
 #define EXI_iso1_DATATYPES_DECODER_C
 
-#if DEPLOY_ISO2_CODEC == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC == SUPPORT_YES
 
 /** event-code */
 static uint32_t eventCode;
@@ -15684,7 +15684,7 @@ int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
 	return errn;
 }
 
-#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
 int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag) {
 	errn = readEXIHeader(stream);
 
@@ -17762,10 +17762,10 @@ int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 
 	return errn;
 }
-#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
+#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
 
 
-#endif /* DEPLOY_ISO2_CODEC */
+#endif /* DEPLOY_ISO1_CODEC */
 
 #endif
 
diff --git a/src/iso1/iso1EXIDatatypesDecoder.h b/src/iso1/iso1EXIDatatypesDecoder.h
index 22f2b8f..501dab1 100644
--- a/src/iso1/iso1EXIDatatypesDecoder.h
+++ b/src/iso1/iso1EXIDatatypesDecoder.h
@@ -42,7 +42,7 @@
 extern "C" {
 #endif
 
-#if DEPLOY_ISO2_CODEC == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC == SUPPORT_YES
 
 #include <stdint.h>
 
@@ -51,11 +51,11 @@ extern "C" {
 
 int decode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc);
 
-#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
 int decode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag);
-#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
+#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
 
-#endif /* DEPLOY_ISO2_CODEC */
+#endif /* DEPLOY_ISO1_CODEC */
 
 #ifdef __cplusplus
 }
diff --git a/src/iso1/iso1EXIDatatypesEncoder.c b/src/iso1/iso1EXIDatatypesEncoder.c
index 8bb3048..3e311ac 100644
--- a/src/iso1/iso1EXIDatatypesEncoder.c
+++ b/src/iso1/iso1EXIDatatypesEncoder.c
@@ -41,7 +41,7 @@
 #ifndef EXI_iso1_DATATYPES_ENCODER_C
 #define EXI_iso1_DATATYPES_ENCODER_C
 
-#if DEPLOY_ISO2_CODEC == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC == SUPPORT_YES
 
 static int errn;
 
@@ -11383,7 +11383,7 @@ int encode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc)
 	return errn;
 }
 
-#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
 int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag) {
 	errn = writeEXIHeader(stream);
 
@@ -13243,10 +13243,10 @@ int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag)
 
 	return errn;
 }
-#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
+#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
 
 
-#endif /* DEPLOY_ISO2_CODEC */
+#endif /* DEPLOY_ISO1_CODEC */
 
 #endif
 
diff --git a/src/iso1/iso1EXIDatatypesEncoder.h b/src/iso1/iso1EXIDatatypesEncoder.h
index ea17654..39a8c79 100644
--- a/src/iso1/iso1EXIDatatypesEncoder.h
+++ b/src/iso1/iso1EXIDatatypesEncoder.h
@@ -42,7 +42,7 @@
 extern "C" {
 #endif
 
-#if DEPLOY_ISO2_CODEC == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC == SUPPORT_YES
 
 #include <stdint.h>
 
@@ -52,12 +52,12 @@ extern "C" {
 
 int encode_iso1ExiDocument(bitstream_t* stream, struct iso1EXIDocument* exiDoc);
 
-#if DEPLOY_ISO2_CODEC_FRAGMENT == SUPPORT_YES
+#if DEPLOY_ISO1_CODEC_FRAGMENT == SUPPORT_YES
 int encode_iso1ExiFragment(bitstream_t* stream, struct iso1EXIFragment* exiFrag);
-#endif /* DEPLOY_ISO2_CODEC_FRAGMENT */
+#endif /* DEPLOY_ISO1_CODEC_FRAGMENT */
 
 
-#endif /* DEPLOY_ISO2_CODEC */
+#endif /* DEPLOY_ISO1_CODEC */
 
 #ifdef __cplusplus
 }