CMakeLists.txt | 2 +-
poppler/Makefile.am | 2 +-
poppler/XRef.cc | 11 ++++++-----
qt4/src/CMakeLists.txt | 2 +-
qt4/src/Makefile.am | 2 +-
5 files changed, 10 insertions(+), 9 deletions(-)
New commits:
commit 46d4fab82332e71d0b68c0a8deeac78f2201ed14
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Wed Mar 12 20:35:33 2008 +0100
Increment version of libpoppler and libpoppler-qt4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6d8c27d..08b9fb6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -225,7 +225,7 @@ add_library(poppler STATIC ${poppler_SRCS})
else(MSVC)
add_library(poppler SHARED ${poppler_SRCS})
endif(MSVC)
-set_target_properties(poppler PROPERTIES VERSION 2.0.0 SOVERSION 2)
+set_target_properties(poppler PROPERTIES VERSION 3.0.0 SOVERSION 3)
target_link_libraries(poppler ${poppler_LIBS})
install(TARGETS poppler RUNTIME DESTINATION bin LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib)
diff --git a/poppler/Makefile.am b/poppler/Makefile.am
index a768414..515dece 100644
--- a/poppler/Makefile.am
+++ b/poppler/Makefile.am
@@ -113,7 +113,7 @@ libpoppler_la_LIBADD = \
$(FONTCONFIG_LIBS) \
$(win32_libs)
-libpoppler_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@
+libpoppler_la_LDFLAGS = -version-info 3:0:0 @create_shared_lib@
if ENABLE_XPDF_HEADERS
diff --git a/qt4/src/CMakeLists.txt b/qt4/src/CMakeLists.txt
index 4099ab9..c77df13 100644
--- a/qt4/src/CMakeLists.txt
+++ b/qt4/src/CMakeLists.txt
@@ -33,7 +33,7 @@ if (ENABLE_SPLASH)
endif (ENABLE_SPLASH)
qt4_automoc(${poppler_qt4_SRCS})
add_library(poppler-qt4 SHARED ${poppler_qt4_SRCS})
-set_target_properties(poppler-qt4 PROPERTIES VERSION 2.0.0 SOVERSION 2)
+set_target_properties(poppler-qt4 PROPERTIES VERSION 3.0.0 SOVERSION 3)
target_link_libraries(poppler-qt4 poppler ${QT4_QTCORE_LIBRARY}
${QT4_QTGUI_LIBRARY} ${QT4_QTXML_LIBRARY})
if(MSVC)
target_link_libraries(poppler-qt4 poppler ${poppler_LIBS})
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index 444882f..7353072 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -59,7 +59,7 @@ libpoppler_qt4_la_LIBADD += \
$(top_builddir)/poppler/libpoppler-arthur.la
endif
-libpoppler_qt4_la_LDFLAGS = -version-info 2:0:0
+libpoppler_qt4_la_LDFLAGS = -version-info 3:0:0
# This rule lets GNU make create any *.moc from the equivalent *.h
.h.moc:
commit 550c1fc73a6d2af65728751fd0b59ccc7110fa8b
Author: Albert Astals Cid <[EMAIL PROTECTED]>
Date: Wed Mar 12 20:34:48 2008 +0100
Init to false updated field of XRefEntries plus indenting fixes
diff --git a/poppler/XRef.cc b/poppler/XRef.cc
index dd3593a..7362a3c 100644
--- a/poppler/XRef.cc
+++ b/poppler/XRef.cc
@@ -412,6 +412,7 @@ GBool XRef::readXRefTable(Parser *parser, Guint *pos) {
entries[i].offset = 0xffffffff;
entries[i].type = xrefEntryFree;
entries[i].obj.initNull ();
+ entries[i].updated = false;
}
size = newSize;
}
@@ -756,17 +757,17 @@ GBool XRef::constructXRef() {
error(-1, "Bad object number");
return gFalse;
}
- if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) !=
newSize) {
- error(-1, "Invalid 'obj' parameters.");
- return gFalse;
- }
+ if (newSize*(int)sizeof(XRefEntry)/sizeof(XRefEntry) !=
newSize) {
+ error(-1, "Invalid 'obj' parameters.");
+ return gFalse;
+ }
entries = (XRefEntry *)
greallocn(entries, newSize, sizeof(XRefEntry));
for (i = size; i < newSize; ++i) {
entries[i].offset = 0xffffffff;
entries[i].type = xrefEntryFree;
entries[i].obj.initNull ();
- entries[i].updated = false;
+ entries[i].updated = false;
}
size = newSize;
}
_______________________________________________
poppler mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/poppler
