[Hdrflow-svn] SF.net SVN: hdrflow: [104] lib/openlibraries
Status: Pre-Alpha
Brought to you by:
glslang
|
From: <gl...@us...> - 2007-04-24 22:56:53
|
Revision: 104
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=104&view=rev
Author: glslang
Date: 2007-04-24 15:56:51 -0700 (Tue, 24 Apr 2007)
Log Message:
-----------
+ conformant copyright changes
Modified Paths:
--------------
lib/openlibraries/src/openassetlib/al/al_plugin.cpp
lib/openlibraries/src/openassetlib/al/guid.cpp
lib/openlibraries/src/openassetlib/py/asset.cpp
lib/openlibraries/src/openassetlib/py/guid.cpp
lib/openlibraries/src/openassetlib/py/openassetlib.cpp
lib/openlibraries/src/openassetlib/py/plugin.cpp
lib/openlibraries/src/openassetlib/py/py.cpp
lib/openlibraries/src/openassetlib/py/py.hpp
lib/openlibraries/src/openassetlib/py/python.hpp
lib/openlibraries/src/openassetlib/py/set.cpp
lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp
lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp
lib/openlibraries/test/openmedialib/store/store.cpp
Modified: lib/openlibraries/src/openassetlib/al/al_plugin.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/al/al_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/al/al_plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// al_plugin.cpp - Interface to an openassetlib plugin.
//
-// Copyright (C) 2006 Visual Media FX Ltd.
+// Copyright (C) 2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/al/guid.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/al/guid.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/al/guid.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// guid.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/asset.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/asset.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/asset.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// asset.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/guid.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/guid.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/guid.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// asset.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/openassetlib.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/openassetlib.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/openassetlib.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// openassetlib.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/plugin.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// plugin.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/py.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/py.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/py.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// py.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/py.hpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/py.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/py.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// py.hpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/python.hpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/python.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/python.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// python.hpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openassetlib/py/set.cpp
===================================================================
--- lib/openlibraries/src/openassetlib/py/set.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openassetlib/py/set.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,6 +1,6 @@
// set.cpp
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - An BMP plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - A BMP plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/bmp_plugin.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - A BMP plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/bmp/config.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// BMP - An BMP plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/config.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
@@ -48,46 +48,31 @@
int width, height, depth;
TIFFGetField( tif, TIFFTAG_IMAGEWIDTH, &width );
-
TIFFGetField( tif, TIFFTAG_IMAGELENGTH, &height );
-
if( !TIFFGetField( tif, TIFFTAG_IMAGEDEPTH, &depth ) ) depth = 1;
unsigned short config;
-
TIFFGetField( tif, TIFFTAG_PLANARCONFIG, &config );
if( config != PLANARCONFIG_CONTIG )
{
-
TIFFClose( tif );
-
return il::image_type_ptr( );
-
}
-
unsigned short photo;
TIFFGetField( tif, TIFFTAG_PHOTOMETRIC, &photo );
if( config != PHOTOMETRIC_MINISBLACK && photo != PHOTOMETRIC_RGB )
{
-
TIFFClose( tif );
-
return il::image_type_ptr( );
-
}
-
unsigned short bpp, components;
-
TIFFGetField( tif, TIFFTAG_BITSPERSAMPLE, &bpp );
-
TIFFGetField( tif, TIFFTAG_SAMPLESPERPIXEL, &components );
-
-
il::image_type_ptr im = tiff_image_type_to_image_type( components, width, height );
if( !im )
return il::image_type_ptr( );
@@ -100,15 +85,12 @@
int tile_width, tile_height, tile_depth;
TIFFGetField( tif, TIFFTAG_TILEWIDTH, &tile_width );
-
TIFFGetField( tif, TIFFTAG_TILELENGTH, &tile_height );
if( !TIFFGetField( tif, TIFFTAG_TILEDEPTH, &tile_depth ) )
-
tile_depth = 1;
std::vector<unsigned char> buf( TIFFTileSize( tif ) );
-
for( int k = 0; k < depth; k += tile_depth )
{
for( int j = 0; j < height; j += tile_height )
@@ -126,9 +108,7 @@
}
}
}
-
}
-
else
{
unsigned int rows;
@@ -138,7 +118,6 @@
for( int i = 0; i < height * depth; i += rows )
{
tstrip_t strip = TIFFComputeStrip( tif, i, 0 );
-
TIFFReadEncodedStrip( tif, strip, data + i * im->pitch( ), strip_size );
}
}
Modified: lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp
===================================================================
--- lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openimagelib/plugins/tiff/tiff_plugin.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// TIFF - A TIFF plugin to il.
-// Copyright (C) 2005-2006 Visual Media FX Ltd.
+// Copyright (C) 2005-2006 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp
===================================================================
--- lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openobjectlib/plugins/X3D/config.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// X3D - An X3D plugin to sg.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openpluginlib/pl/content_handler_libxml.hpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// openpluginlib - A plugin interface to openlibraries.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj
===================================================================
--- lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/src/openpluginlib/pl/pl_vc8.vcproj 2007-04-24 22:56:51 UTC (rev 104)
@@ -293,10 +293,6 @@
>
</File>
<File
- RelativePath=".\content_handler_libxml.hpp"
- >
- </File>
- <File
RelativePath=".\content_handler_msxml.hpp"
>
</File>
@@ -373,11 +369,11 @@
>
</File>
<File
- RelativePath=".\property.hpp"
+ RelativePath=".\pcos\property.hpp"
>
</File>
<File
- RelativePath=".\pcos\property.hpp"
+ RelativePath=".\property.hpp"
>
</File>
<File
Modified: lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp
===================================================================
--- lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/test/openimagelib/GL/_3D_lightmap/_3D_lightmap.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// il - A image library representation.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
Modified: lib/openlibraries/test/openmedialib/store/store.cpp
===================================================================
--- lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-24 22:00:03 UTC (rev 103)
+++ lib/openlibraries/test/openmedialib/store/store.cpp 2007-04-24 22:56:51 UTC (rev 104)
@@ -1,7 +1,7 @@
// ml - A media library representation.
-// Copyright (C) 2005 Visual Media FX Ltd.
+// Copyright (C) 2005 VM Inc.
// Released under the LGPL.
// For more information, see http://www.openlibraries.org.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|