Просмотр исходного кода

# fix C issues in the headers. This fixes [3481648] (https://sourceforge.net/tracker/?func=detail&aid=3481648&group_id=226462&atid=1067632)

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@1137 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
aramis_acg 13 лет назад
Родитель
Сommit
daf7c07ff1
3 измененных файлов с 8 добавлено и 8 удалено
  1. 2 2
      include/aiVector2D.h
  2. 1 1
      include/aiVector3D.h
  3. 5 5
      include/assimp.h

+ 2 - 2
include/aiVector2D.h

@@ -96,8 +96,8 @@ typedef aiVector2t<float> aiVector2D;
 
 #else
 
-struct aiVector2t {
-	TReal x,y;
+struct aiVector2D {
+	float x,y;
 };
 
 #endif // __cplusplus

+ 1 - 1
include/aiVector3D.h

@@ -127,7 +127,7 @@ typedef aiVector3t<float> aiVector3D;
 
 struct aiVector3D {
 
-	float x,y,y;
+	float x,y,z;
 } PACK_STRUCT;
 
 #endif // __cplusplus

+ 5 - 5
include/assimp.h

@@ -81,7 +81,7 @@ struct aiLogStream
  *  @see aiSetPropertyString
  */
 // --------------------------------------------------------------------------------
-struct aiPropertyStore {};
+struct aiPropertyStore { char sentinel; };
 
 /** Our own C boolean type */
 typedef int aiBool;
@@ -344,7 +344,7 @@ ASSIMP_API C_STRUCT aiPropertyStore* aiCreatePropertyStore(void);
 /** Delete a property store.
  * @param p Property store to be deleted.
  */
-ASSIMP_API void aiReleasePropertyStore(aiPropertyStore* p);
+ASSIMP_API void aiReleasePropertyStore(C_STRUCT aiPropertyStore* p);
 
 // --------------------------------------------------------------------------------
 /** Set an integer property. 
@@ -358,7 +358,7 @@ ASSIMP_API void aiReleasePropertyStore(aiPropertyStore* p);
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyInteger(
-	aiPropertyStore* store,
+	C_STRUCT aiPropertyStore* store,
 	const char* szName, 
 	int value);
 
@@ -374,7 +374,7 @@ ASSIMP_API void aiSetImportPropertyInteger(
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyFloat(
-	aiPropertyStore* store,
+	C_STRUCT aiPropertyStore* store,
 	const char* szName,
 	float value);
 
@@ -391,7 +391,7 @@ ASSIMP_API void aiSetImportPropertyFloat(
  * @param value New value for the property
  */
 ASSIMP_API void aiSetImportPropertyString(
-	aiPropertyStore* store,
+	C_STRUCT aiPropertyStore* store,
 	const char* szName,
 	const C_STRUCT aiString* st);