[Midnightbsd-cvs] mports [18405] trunk/graphics/ilmbase/files: drop patchset

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Mar 28 05:51:15 EDT 2015


Revision: 18405
          http://svnweb.midnightbsd.org/mports/?rev=18405
Author:   laffer1
Date:     2015-03-28 05:51:14 -0400 (Sat, 28 Mar 2015)
Log Message:
-----------
drop patchset

Removed Paths:
-------------
    trunk/graphics/ilmbase/files/patch-IlmThread-IlmThreadPool.cpp
    trunk/graphics/ilmbase/files/patch-Imath-ImathFun.cpp
    trunk/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp
    trunk/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp
    trunk/graphics/ilmbase/files/patch-ImathTest-testShear.cpp
    trunk/graphics/ilmbase/files/patch-Makefile

Deleted: trunk/graphics/ilmbase/files/patch-IlmThread-IlmThreadPool.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-IlmThread-IlmThreadPool.cpp	2015-03-28 09:48:44 UTC (rev 18404)
+++ trunk/graphics/ilmbase/files/patch-IlmThread-IlmThreadPool.cpp	2015-03-28 09:51:14 UTC (rev 18405)
@@ -1,43 +0,0 @@
---- IlmThread/IlmThreadPool.cpp.orig	2006-12-09 06:59:36.000000000 +0900
-+++ IlmThread/IlmThreadPool.cpp	2007-10-07 23:29:07.000000000 +0900
-@@ -247,7 +247,7 @@
-     // an error like: "pure virtual method called"
-     //
- 
--    for (int i = 0; i < numThreads; i++)
-+    for (unsigned int i = 0; i < numThreads; i++)
-     {
- 	taskSemaphore.post();
- 	threadSemaphore.wait();
-@@ -364,19 +364,19 @@
- 
-     Lock lock (_data->threadMutex);
- 
--    if (count > _data->numThreads)
-+    if ((unsigned int)count > _data->numThreads)
-     {
- 	//
-         // Add more threads
- 	//
- 
--        while (_data->numThreads < count)
-+        while (_data->numThreads < (unsigned int)count)
-         {
-             _data->threads.push_back (new WorkerThread (_data));
-             _data->numThreads++;
-         }
-     }
--    else if (count < _data->numThreads)
-+    else if ((unsigned int)count < _data->numThreads)
-     {
- 	//
- 	// Wait until all existing threads are finished processing,
-@@ -389,7 +389,7 @@
-         // Add in new threads
- 	//
- 
--        while (_data->numThreads < count)
-+        while (_data->numThreads < (unsigned int)count)
-         {
-             _data->threads.push_back (new WorkerThread (_data));
-             _data->numThreads++;

Deleted: trunk/graphics/ilmbase/files/patch-Imath-ImathFun.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-Imath-ImathFun.cpp	2015-03-28 09:48:44 UTC (rev 18404)
+++ trunk/graphics/ilmbase/files/patch-Imath-ImathFun.cpp	2015-03-28 09:51:14 UTC (rev 18405)
@@ -1,44 +0,0 @@
---- Imath/ImathFun.cpp.orig	2006-12-09 06:59:37.000000000 +0900
-+++ Imath/ImathFun.cpp	2007-10-07 23:23:38.000000000 +0900
-@@ -33,6 +33,7 @@
- ///////////////////////////////////////////////////////////////////////////
- 
- 
-+#include <inttypes.h>
- #include "ImathFun.h"
- 
- namespace Imath {
-@@ -41,14 +42,14 @@
- float
- succf (float f)
- {
--    union {float f; int i;} u;
-+    union {float f; int32_t i;} u;
-     u.f = f;
- 
-     if ((u.i & 0x7f800000) == 0x7f800000)
-     {
-         // Nan or infinity; don't change value.
-     }
--    else if (u.i == 0x00000000 || u.i == 0x80000000)
-+    else if (u.i == (int32_t)0x00000000 || u.i == (int32_t)0x80000000)
-     {
-         // Plus or minus zero.
- 
-@@ -76,14 +77,14 @@
- float
- predf (float f)
- {
--    union {float f; int i;} u;
-+    union {float f; int32_t i;} u;
-     u.f = f;
- 
-     if ((u.i & 0x7f800000) == 0x7f800000)
-     {
-         // Nan or infinity; don't change value.
-     }
--    else if (u.i == 0x00000000 || u.i == 0x80000000)
-+    else if (u.i == (int32_t)0x00000000 || u.i == (int32_t)0x80000000)
-     {
-         // Plus or minus zero.
- 

Deleted: trunk/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp	2015-03-28 09:48:44 UTC (rev 18404)
+++ trunk/graphics/ilmbase/files/patch-ImathTest-testBoxAlgo.cpp	2015-03-28 09:51:14 UTC (rev 18405)
@@ -1,11 +0,0 @@
---- ImathTest/testBoxAlgo.cpp.orig	2007-07-13 13:48:45.000000000 +0900
-+++ ImathTest/testBoxAlgo.cpp	2007-10-07 23:26:22.000000000 +0900
-@@ -336,7 +336,7 @@
- 	Box3f ()
-     };
- 
--    for (int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
-+    for (unsigned int i = 0; i < sizeof (boxes) / sizeof (boxes[0]); ++i)
- 	testRayBoxIntersection (boxes[i]);
- }
- 

Deleted: trunk/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp	2015-03-28 09:48:44 UTC (rev 18404)
+++ trunk/graphics/ilmbase/files/patch-ImathTest-testLineAlgo.cpp	2015-03-28 09:51:14 UTC (rev 18405)
@@ -1,10 +0,0 @@
---- ImathTest/testLineAlgo.cpp.orig	2006-12-09 06:59:38.000000000 +0900
-+++ ImathTest/testLineAlgo.cpp	2007-10-07 23:24:58.000000000 +0900
-@@ -399,7 +399,6 @@
- 	    V3f p1 = v0 * b.x + v1 * b.y + v2 * b.z;
- 
- 	    V3f p0;
--	    int j = 0;
- 
- 	    do
- 	    {

Deleted: trunk/graphics/ilmbase/files/patch-ImathTest-testShear.cpp
===================================================================
--- trunk/graphics/ilmbase/files/patch-ImathTest-testShear.cpp	2015-03-28 09:48:44 UTC (rev 18404)
+++ trunk/graphics/ilmbase/files/patch-ImathTest-testShear.cpp	2015-03-28 09:51:14 UTC (rev 18405)
@@ -1,10 +0,0 @@
---- ImathTest/testShear.cpp.orig	2006-12-09 06:59:38.000000000 +0900
-+++ ImathTest/testShear.cpp	2007-10-07 23:24:27.000000000 +0900
-@@ -54,7 +54,6 @@
- 
-     const float         epsilon = Imath::limits< float >::epsilon();
- 
--    float    	        array[6] = { 1.0F, 2.0F, 3.0F, 4.0F, 5.0F, 6.0F };
-     Imath::Shear6f    	testConstructor1;
-     Imath::Shear6f    	testConstructor2( testConstructor1 );
- 

Deleted: trunk/graphics/ilmbase/files/patch-Makefile
===================================================================
--- trunk/graphics/ilmbase/files/patch-Makefile	2015-03-28 09:48:44 UTC (rev 18404)
+++ trunk/graphics/ilmbase/files/patch-Makefile	2015-03-28 09:51:14 UTC (rev 18405)
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2007-08-04 02:28:25.000000000 +0900
-+++ Makefile.in	2007-10-07 03:17:50.000000000 +0900
-@@ -205,7 +205,7 @@
-         README README.CVS README.OSX README.win32 bootstrap \
- 	config.windows/IlmBaseConfig.h
- 
--pkgconfigdir = $(libdir)/pkgconfig
-+pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = IlmBase.pc
- all: all-recursive
- 



More information about the Midnightbsd-cvs mailing list