[Hdrflow-svn] SF.net SVN: hdrflow: [121] lib/extras

[<gl...@us...>]

Revision: 121
          http://hdrflow.svn.sourceforge.net/hdrflow/?rev=121&view=rev
Author:   glslang
Date:     2007-05-17 13:07:49 -0700 (Thu, 17 May 2007)

Log Message:
-----------
+more *nix updates

Modified Paths:
--------------
    lib/extras/configure.ac
    lib/extras/src/panoramic/panoramic.cpp
    lib/extras/src/raw/dcraw.c

Added Paths:
-----------
    lib/extras/src/raw/Makefile.am

Modified: lib/extras/configure.ac
===================================================================
--- lib/extras/configure.ac	2007-05-16 22:43:19 UTC (rev 120)
+++ lib/extras/configure.ac	2007-05-17 20:07:49 UTC (rev 121)
@@ -158,7 +158,7 @@
 
 dnl include, lib and plugin path
 EXTRAS_LIBPATH="$libdir/hdrflow_extras-$EX_MAJOR.$EX_MINOR.$EX_SUB"
-EXTRAS_DATAPATH="$datadir/hdrflow-extras-$EX_MAJOR.$EX_MINOR.$EX_SUB"
+EXTRAS_DATAPATH="$datadir/hdrflow_extras-$EX_MAJOR.$EX_MINOR.$EX_SUB"
 EXTRAS_PLUGINPATH="${EXTRAS_LIBPATH}/plugins"
 AC_SUBST(EXTRAS_LIBPATH)
 AC_SUBST(EXTRAS_PLUGINPATH)

Modified: lib/extras/src/panoramic/panoramic.cpp
===================================================================
--- lib/extras/src/panoramic/panoramic.cpp	2007-05-16 22:43:19 UTC (rev 120)
+++ lib/extras/src/panoramic/panoramic.cpp	2007-05-17 20:07:49 UTC (rev 121)
@@ -19,6 +19,7 @@
 namespace il = olib::openimagelib::il;
 namespace ml = olib::openmedialib::ml;
 namespace fs = boost::filesystem;
+namespace pcos = olib::openpluginlib::pcos;
 
 namespace extras { namespace hdrflow { namespace pan {
 
@@ -61,12 +62,37 @@
 	class panoramic_filter : public ml::filter_type
 	{
 	public:
+		explicit panoramic_filter( )
+			: source_param_( pcos::key::from_string( "source_projection" ) )
+			, dest_param_( pcos::key::from_string( "destination_projection" ) )
+		{
+			properties( ).append( source_param_ = pl::string( "angular_map" ) );
+			properties( ).append( dest_param_ = pl::string( "angular_map" ) );
+		}
+
+	public:
 		const pl::wstring get_uri( ) const { return L"panoramic:"; }
 		
 		ml::frame_type_ptr fetch( )
 		{
-			return ml::frame_type_ptr( );
+			acquire_values( );
+
+			pl::string source_map = source_param_.value<pl::string>( );
+			pl::string dest_map   = dest_param_.value<pl::string>( );
+			ml::frame_type_ptr result = fetch_from_slot( );
+
+			if( source_map == dest_map )
+				return result;
+
+			if( result && result->get_image( ) )
+				result->set_image( convert( result->get_image( ), source_map, dest_map ) );
+
+			return result;
 		}
+
+	private:
+		pcos::property source_param_;
+		pcos::property dest_param_;
 	};
 }
 

Added: lib/extras/src/raw/Makefile.am
===================================================================
--- lib/extras/src/raw/Makefile.am	                        (rev 0)
+++ lib/extras/src/raw/Makefile.am	2007-05-17 20:07:49 UTC (rev 121)
@@ -0,0 +1,22 @@
+
+#
+#
+#
+
+libdir = $(EXTRAS_PLUGINPATH)
+
+lib_LTLIBRARIES = libhdrflow_extras_raw.la
+
+bin_PROGRAMS = dcraw
+
+libhdrflow_extras_raw_la_SOURCES = \
+	raw.cpp
+
+libhdrflow_extras_raw_la_CXXFLAGS = \
+	$(BOOST_INCLUDE_PATH)	    \
+	-I$(top_builddir)/../openlibraries/src \
+	$(OFX_INCLUDE_PATH)
+
+dcraw_CFLAGS = \
+	-DNO_JPEG \
+	-DNO_LCMS


Property changes on: lib/extras/src/raw/Makefile.am
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: lib/extras/src/raw/dcraw.c
===================================================================
--- lib/extras/src/raw/dcraw.c	2007-05-16 22:43:19 UTC (rev 120)
+++ lib/extras/src/raw/dcraw.c	2007-05-17 20:07:49 UTC (rev 121)
@@ -334,7 +334,7 @@
 {
   if (fread (pixel, 2, count, ifp) < count) derror();
   if ((order == 0x4949) == (ntohs(0x1234) == 0x1234))
-    _swab (pixel, pixel, count*2);
+    swab (pixel, pixel, count*2);
 }
 
 void CLASS canon_600_fixed_wb (int temp)
@@ -2060,7 +2060,7 @@
   size_t nbytes;
 
   nbytes = fread (jpeg_buffer, 1, 4096, ifp);
-  _swab (jpeg_buffer, jpeg_buffer, nbytes);
+  swab (jpeg_buffer, jpeg_buffer, nbytes);
   cinfo->src->next_input_byte = jpeg_buffer;
   cinfo->src->bytes_in_buffer = nbytes;
   return TRUE;
@@ -7389,7 +7389,7 @@
 	   FORCC ppm [col*colors+c] = lut[image[soff][c]];
       else FORCC ppm2[col*colors+c] =     image[soff][c];
     if (output_bps == 16 && !output_tiff && htons(0x55aa) != 0x55aa)
-      _swab (ppm2, ppm2, width*colors*2);
+      swab (ppm2, ppm2, width*colors*2);
     fwrite (ppm, colors*output_bps/8, width, ofp);
   }
   free (ppm);
@@ -7528,8 +7528,8 @@
     oprof = 0;
     meta_data = ofname = 0;
     if (setjmp (failure)) {
-      if (_fileno(ifp) > 2) fclose(ifp);
-      if (_fileno(ofp) > 2) fclose(ofp);
+      if (fileno(ifp) > 2) fclose(ifp);
+      if (fileno(ofp) > 2) fclose(ofp);
       status = 1;
       goto cleanup;
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.