Changeset 15164

Timestamp:

05/30/13 10:25:52 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: missing include files

Location:

issm/trunk-jpl/src/c

Files:

• modules/Shp2Expx/Shp2Expx.cpp (modified) (2 diffs)
• modules/Shp2Kmlx/Shp2Kmlx.cpp (modified) (1 diff)
• shared/String/ApiPrintf.cpp (modified) (1 diff)
• shared/String/sharedstring.h (modified) (1 diff)
• shared/io/Print/PrintfFunction.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/modules/Shp2Expx/Shp2Expx.cpp

@@ -6 +6 @@
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
+#include "../../kml/kmlobjects.h"
 
 int Shp2Expx(char* filshp,char* filexp){
@@ -562 +563 @@
 
                 else {
-                        _printf_(,"Warning -- Shape " << i << " of type \"" <<SHPTypeName( pstype[i] ) << "\" will be ignored.\n\n");
+                        _printf_("Warning -- Shape " << i << " of type \"" <<SHPTypeName( pstype[i] ) << "\" will be ignored.\n\n");
                 }
         }

issm/trunk-jpl/src/c/modules/Shp2Kmlx/Shp2Kmlx.cpp

@@ -6 +6 @@
 #include "../../shared/shared.h"
 #include "../../toolkits/toolkits.h"
+#include "../../kml/kmlobjects.h"
 
 int Shp2Kmlx(char* filshp,char* filkml,

issm/trunk-jpl/src/c/shared/String/ApiPrintf.cpp

@@ -10 +10 @@
 
 #include <stdio.h>
-#include <string.h>
-#include <ctype.h>
 
-void ApiPrintf(char* format, const char* string){
-        printf(format,string);
-
+void ApiPrintf(const char* string){
+        printf(string);
 }

issm/trunk-jpl/src/c/shared/String/sharedstring.h

@@ -12 +12 @@
 #endif
 
-void ApiPrintf(char* format,const char* string);
+void ApiPrintf(const char* string);
 
 #endif //ifndef _SHAREDSTRING_H_

issm/trunk-jpl/src/c/shared/io/Print/PrintfFunction.cpp

@@ -30 +30 @@
                 __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
                 #else
-                ApiPrintf("%s",message.c_str());
+                ApiPrintf(message.c_str());
                 #endif
         }
@@ -40 +40 @@
         __android_log_print(ANDROID_LOG_INFO, "Native",message.c_str());
         #else
-        ApiPrintf("%s",message.c_str());
+        ApiPrintf(message.c_str());
         #endif