Attachment 10201 Details for Bug 23091 – Fix build patch

[patch] Fix build patch

pdfedit-fixbuild.patch (text/plain), 1.46 KB, created by Kristoffer Grundström on 2018-05-28 03:22:09 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Kristoffer Grundström

Created: 2018-05-28 03:22:09 CEST

Size: 1.46 KB

patch

obsolete

>diff -up ./src/gui/rect2Darray.h.045f17 ./src/gui/rect2Darray.h
>--- ./src/gui/rect2Darray.h.045f17	2009-04-06 17:24:50.000000000 +0200
>+++ ./src/gui/rect2Darray.h	2012-12-07 23:15:09.703862328 +0100
>@@ -305,7 +305,7 @@ void RectArray<T>::myAppend ( const BBox
> 		minY = std::min( minY, item->top() );
> 		maxY = std::max( maxY, item->bottom() );
> 	}
>-	append( item );
>+	this->append( item );
> }
> 
> template <typename T>
>@@ -461,7 +461,7 @@ void Rect2DArray<T>::myAppend( BBoxOfObj
> 	if (toAppend) {
> 		current = new RectArray<T>();
> 		current->myAppend( bbox );
>-		append( current );
>+		this->append( current );
> 	}
> }
> 
>diff -up ./src/kernel/cobject2xpdf.cc.045f17 ./src/kernel/cobject2xpdf.cc
>--- ./src/kernel/cobject2xpdf.cc.045f17	2009-09-11 14:02:56.000000000 +0200
>+++ ./src/kernel/cobject2xpdf.cc	2012-12-07 23:15:33.847932118 +0100
>@@ -718,6 +718,10 @@ simpleValueFromXpdfObj (const Object& ob
> 	rp (obj,val);
> }
> 
>+template
>+void
>+simpleValueFromXpdfObj<pReal, double&> (const Object&, double& val);
>+
> //
> // Special case for pNull
> //
>diff -up ./src/xpdf/xpdf/Object.h.f19build ./src/xpdf/xpdf/Object.h
>--- ./src/xpdf/xpdf/Object.h.f19build	2013-02-18 09:45:55.978433861 -0500
>+++ ./src/xpdf/xpdf/Object.h	2013-02-18 09:46:07.430435071 -0500
>@@ -206,7 +206,7 @@ public:
> private:
> 
>   ObjType type;			// object type
>-  mutable union {		// value for each type:
>+   union {			// value for each type:
>     GBool booln;		//   boolean
>     int intg;			//   integer
>     double real;		//   real

diff -up ./src/gui/rect2Darray.h.045f17 ./src/gui/rect2Darray.h
--- ./src/gui/rect2Darray.h.045f17	2009-04-06 17:24:50.000000000 +0200
+++ ./src/gui/rect2Darray.h	2012-12-07 23:15:09.703862328 +0100
@@ -305,7 +305,7 @@ void RectArray<T>::myAppend ( const BBox
 		minY = std::min( minY, item->top() );
 		maxY = std::max( maxY, item->bottom() );
 	}
-	append( item );
+	this->append( item );
 }
 
 template <typename T>
@@ -461,7 +461,7 @@ void Rect2DArray<T>::myAppend( BBoxOfObj
 	if (toAppend) {
 		current = new RectArray<T>();
 		current->myAppend( bbox );
-		append( current );
+		this->append( current );
 	}
 }
 
diff -up ./src/kernel/cobject2xpdf.cc.045f17 ./src/kernel/cobject2xpdf.cc
--- ./src/kernel/cobject2xpdf.cc.045f17	2009-09-11 14:02:56.000000000 +0200
+++ ./src/kernel/cobject2xpdf.cc	2012-12-07 23:15:33.847932118 +0100
@@ -718,6 +718,10 @@ simpleValueFromXpdfObj (const Object& ob
 	rp (obj,val);
 }
 
+template
+void
+simpleValueFromXpdfObj<pReal, double&> (const Object&, double& val);
+
 //
 // Special case for pNull
 //
diff -up ./src/xpdf/xpdf/Object.h.f19build ./src/xpdf/xpdf/Object.h
--- ./src/xpdf/xpdf/Object.h.f19build	2013-02-18 09:45:55.978433861 -0500
+++ ./src/xpdf/xpdf/Object.h	2013-02-18 09:46:07.430435071 -0500
@@ -206,7 +206,7 @@ public:
 private:
 
   ObjType type;			// object type
-  mutable union {		// value for each type:
+   union {			// value for each type:
     GBool booln;		//   boolean
     int intg;			//   integer
     double real;		//   real

Actions: View | Diff

Attachments on bug 23091: 10198 | 10199 | 10200 | 10201 | 10202