blob: 6f9fe7a8cf995b0def1f70ce95f62ef4c6066c99 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
|
diff -urN opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.cpp opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.cpp
--- opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.cpp 2009-11-30 09:59:08.000000000 +0100
+++ opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.cpp 2010-07-28 14:09:40.000000000 +0200
@@ -48,9 +48,9 @@
#include "OSGGeoReferenceAttachment.h"
#ifdef OSG_WITH_GDAL
-#include "gdal/gdal_priv.h"
-#include "gdal/ogr_srs_api.h"
-#include "gdal/cpl_multiproc.h"
+#include "gdal_priv.h"
+#include "ogr_srs_api.h"
+#include "cpl_multiproc.h"
#endif
diff -urN opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.h opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.h
--- opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGGDALImageFileType.h 2009-11-30 07:49:49.000000000 +0100
+++ opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGGDALImageFileType.h 2010-07-28 14:09:59.000000000 +0200
@@ -48,8 +48,8 @@
#include "boost/shared_ptr.hpp"
#ifdef OSG_WITH_GDAL
-#include "gdal/gdal_priv.h"
-#include "gdal/ogr_srs_api.h"
+#include "gdal_priv.h"
+#include "ogr_srs_api.h"
#endif
OSG_BEGIN_NAMESPACE
diff -urN opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGPNGImageFileType.cpp opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGPNGImageFileType.cpp
--- opensg-2.0_alpha2284-original/Source/System/Image/FileIO/OSGPNGImageFileType.cpp 2009-10-05 23:40:17.000000000 +0200
+++ opensg-2.0_alpha2284/Source/System/Image/FileIO/OSGPNGImageFileType.cpp 2010-07-28 13:56:14.000000000 +0200
@@ -206,7 +206,7 @@
// Convert < 8 bit to 8 bit
if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
{
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
bit_depth = 8;
}
@@ -683,7 +683,7 @@
// Convert < 8 bit to 8 bit
if(color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8)
{
- png_set_gray_1_2_4_to_8(png_ptr);
+ png_set_expand_gray_1_2_4_to_8(png_ptr);
bit_depth = 8;
}
|
GitWeb
