[poppler] 4 commits - qt4/src

[Pino Toscano]

 qt4/src/poppler-annotation.cc |    8 ++++----
 qt4/src/poppler-fontinfo.cc   |   14 ++++++++++++--
 qt4/src/poppler-link.cc       |   10 +++++-----
 qt4/src/poppler-private.h     |    4 ++--
 qt4/src/poppler-qt4.h         |    2 +-
 5 files changed, 24 insertions(+), 14 deletions(-)

New commits:
commit 3e994e8586fa1c87ef7e7f82af1cdacf2cd36310
Author: Pino Toscano <pino at kde.org>
Date:   Fri Feb 8 12:21:56 2008 +0100

    Add the missing font types.

diff --git a/qt4/src/poppler-fontinfo.cc b/qt4/src/poppler-fontinfo.cc
index 08a8b53..8b1ca38 100644
--- a/qt4/src/poppler-fontinfo.cc
+++ b/qt4/src/poppler-fontinfo.cc
@@ -81,9 +81,16 @@ QString FontInfo::typeName() const
 		return QObject::tr("CID Type 0C");
 	case CIDTrueType:
 		return QObject::tr("CID TrueType");
-	default:
-		return QObject::tr("Bug: unexpected font type. Notify poppler mailing list!");
+	case Type1COT:
+		return QObject::tr("Type 1C (OpenType)");
+	case TrueTypeOT:
+		return QObject::tr("TrueType (OpenType)");
+	case CIDType0COT:
+		return QObject::tr("CID Type 0C (OpenType)");
+	case CIDTrueTypeOT:
+		return QObject::tr("CID TrueType (OpenType)");
 	}
+	return QObject::tr("Bug: unexpected font type. Notify poppler mailing list!");
 }
 
 FontInfo& FontInfo::operator=( const FontInfo &fi )
commit ba07963f85d777a441349e23d4c2f510e45c73be
Author: Pino Toscano <pino at kde.org>
Date:   Fri Feb 8 12:19:04 2008 +0100

    Be safe against self-assignment.

diff --git a/qt4/src/poppler-fontinfo.cc b/qt4/src/poppler-fontinfo.cc
index aabb063..08a8b53 100644
--- a/qt4/src/poppler-fontinfo.cc
+++ b/qt4/src/poppler-fontinfo.cc
@@ -88,6 +88,9 @@ QString FontInfo::typeName() const
 
 FontInfo& FontInfo::operator=( const FontInfo &fi )
 {
+	if (this == &fi)
+		return *this;
+
 	*m_data = *fi.m_data;
 	return *this;
 }
commit 834b86548e09f4b24cdb2f194299d053b9b55022
Author: Pino Toscano <pino at kde.org>
Date:   Fri Feb 8 12:15:16 2008 +0100

    Small apidox fix.

diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index 7ab3a32..6d79806 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -235,7 +235,7 @@ namespace Poppler {
 	/**
 		The checksum of the file.
 		
-		This will return an empty QString if there is no checksum element
+	   This will return an empty QByteArray if there is no checksum element.
 	*/
 	QByteArray checksum() const;
 
commit 11a61eac5b8cde04bf762bbbe0deab5c0bd52951
Author: Pino Toscano <pino at kde.org>
Date:   Fri Feb 8 02:21:32 2008 +0100

    Pack few bools together.

diff --git a/qt4/src/poppler-annotation.cc b/qt4/src/poppler-annotation.cc
index da7c513..302bcbb 100644
--- a/qt4/src/poppler-annotation.cc
+++ b/qt4/src/poppler-annotation.cc
@@ -673,19 +673,19 @@ class LineAnnotationPrivate : public AnnotationPrivate
         QLinkedList<QPointF> linePoints;
         LineAnnotation::TermStyle lineStartStyle;
         LineAnnotation::TermStyle lineEndStyle;
-        bool lineClosed;  // (if true draw close shape)
+        bool lineClosed : 1;  // (if true draw close shape)
+        bool lineShowCaption : 1;
         QColor lineInnerColor;
         double lineLeadingFwdPt;
         double lineLeadingBackPt;
-        bool lineShowCaption;
         LineAnnotation::LineIntent lineIntent;
 };
 
 LineAnnotationPrivate::LineAnnotationPrivate()
     : AnnotationPrivate(), lineStartStyle( LineAnnotation::None ),
     lineEndStyle( LineAnnotation::None ), lineClosed( false ),
-    lineLeadingFwdPt( 0 ), lineLeadingBackPt( 0 ),
-    lineShowCaption( false ), lineIntent( LineAnnotation::Unknown )
+    lineShowCaption( false ), lineLeadingFwdPt( 0 ), lineLeadingBackPt( 0 ),
+    lineIntent( LineAnnotation::Unknown )
 {
 }
 
diff --git a/qt4/src/poppler-link.cc b/qt4/src/poppler-link.cc
index 4d407a3..4d0f616 100644
--- a/qt4/src/poppler-link.cc
+++ b/qt4/src/poppler-link.cc
@@ -37,8 +37,8 @@ class LinkDestinationPrivate : public QSharedData
 		double left, bottom; // position
 		double right, top;
 		double zoom; // zoom factor
-		bool changeLeft, changeTop; // for destXYZ links, which position
-		bool changeZoom; //   components to change
+		bool changeLeft : 1, changeTop : 1; // for destXYZ links, which position
+		bool changeZoom : 1; //   components to change
 };
 
 	LinkDestinationPrivate::LinkDestinationPrivate()
@@ -135,9 +135,9 @@ class LinkSoundPrivate : public LinkPrivate
 		~LinkSoundPrivate();
 
 		double volume;
-		bool sync;
-		bool repeat;
-		bool mix;
+		bool sync : 1;
+		bool repeat : 1;
+		bool mix : 1;
 		SoundObject *sound;
 };
 
diff --git a/qt4/src/poppler-private.h b/qt4/src/poppler-private.h
index 27a4b6f..36879c4 100644
--- a/qt4/src/poppler-private.h
+++ b/qt4/src/poppler-private.h
@@ -275,8 +275,8 @@ namespace Poppler {
 
 		QString fontName;
 		QString fontFile;
-		bool isEmbedded;
-		bool isSubset;
+		bool isEmbedded : 1;
+		bool isSubset : 1;
 		FontInfo::Type type;
     };