[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] libcvd cvd/image_io.h cvd/internal/load_and_sav...
|
From: |
Edward Rosten |
|
Subject: |
[libcvd-members] libcvd cvd/image_io.h cvd/internal/load_and_sav... |
|
Date: |
Sun, 21 Mar 2010 19:02:03 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: libcvd
Changes by: Edward Rosten <edrosten> 10/03/21 19:02:03
Modified files:
cvd : image_io.h
cvd/internal : load_and_save.h
cvd/internal/io: cvdimage.h fits.h jpeg.h png.h pnm_grok.h
save_postscript.h text.h tiff.h
pnm_src : cvdimage.cxx fitswrite.cc jpeg.cxx png.cc
pnm_grok.cxx save_postscript.cxx text_write.cc
tiffwrite.cc
Log message:
System for passing parameters to image writers
works for jepg quality only at the moment
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/image_io.h?cvsroot=libcvd&r1=1.42&r2=1.43
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/load_and_save.h?cvsroot=libcvd&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/cvdimage.h?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/fits.h?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/jpeg.h?cvsroot=libcvd&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/png.h?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/pnm_grok.h?cvsroot=libcvd&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/save_postscript.h?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/text.h?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/cvd/internal/io/tiff.h?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/cvdimage.cxx?cvsroot=libcvd&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/fitswrite.cc?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/jpeg.cxx?cvsroot=libcvd&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/png.cc?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/pnm_grok.cxx?cvsroot=libcvd&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/save_postscript.cxx?cvsroot=libcvd&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/text_write.cc?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/libcvd/pnm_src/tiffwrite.cc?cvsroot=libcvd&r1=1.4&r2=1.5
Patches:
Index: cvd/image_io.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/image_io.h,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- cvd/image_io.h 15 Feb 2010 10:40:48 -0000 1.42
+++ cvd/image_io.h 21 Mar 2010 19:02:02 -0000 1.43
@@ -289,33 +289,33 @@
/// @param t The image file format to use (see ImageType::ImageType for
a list of supported formats)
/// @ingroup gImageIO
template<class PixelType>
- void img_save(const BasicImage<PixelType>& im, std::ostream& o,
ImageType::ImageType t)
+ void img_save(const BasicImage<PixelType>& im, std::ostream& o,
ImageType::ImageType t, const std::map<std::string, Parameter<> >& p =
std::map<std::string, Parameter<> >())
{
switch (t) {
default:
case ImageType::PNM:
case ImageType::Automatic:
case ImageType::Unknown:
- Internal::writeImage<PixelType, PNM::pnm_writer>(im, o); break;
+ Internal::writeImage<PixelType, PNM::pnm_writer>(im, o, p);
break;
#ifdef CVD_HAVE_JPEG
- case ImageType::JPEG: Internal::writeImage<PixelType,
JPEG::writer>(im,o); break;
+ case ImageType::JPEG: Internal::writeImage<PixelType,
JPEG::writer>(im,o, p); break;
#endif
#ifdef CVD_HAVE_PNG
- case ImageType::PNG: Internal::writeImage<PixelType,
PNG::png_writer>(im,o); break;
+ case ImageType::PNG: Internal::writeImage<PixelType,
PNG::png_writer>(im,o, p); break;
#endif
#ifdef CVD_HAVE_TIFF
- case ImageType::TIFF: Internal::writeImage<PixelType,
TIFF::tiff_writer>(im,o); break;
+ case ImageType::TIFF: Internal::writeImage<PixelType,
TIFF::tiff_writer>(im,o, p); break;
#endif
- case ImageType::FITS: Internal::writeImage<PixelType,
FITS::writer>(im,o); break;
+ case ImageType::FITS: Internal::writeImage<PixelType,
FITS::writer>(im,o, p); break;
case ImageType::BMP: BMP::writeBMP(im, o); break;
- case ImageType::TXT: Internal::writeImage<PixelType,
TEXT::writer>(im, o); break;
- case ImageType::PS: Internal::writeImage<PixelType, PS::writer>(im,
o); break;
- case ImageType::EPS: Internal::writeImage<PixelType,
PS::eps_writer>(im, o); break;
- case ImageType::CVD: Internal::writeImage<PixelType,
CVDimage::writer>(im,o); break;
+ case ImageType::TXT: Internal::writeImage<PixelType,
TEXT::writer>(im, o, p); break;
+ case ImageType::PS: Internal::writeImage<PixelType, PS::writer>(im,
o, p); break;
+ case ImageType::EPS: Internal::writeImage<PixelType,
PS::eps_writer>(im, o, p); break;
+ case ImageType::CVD: Internal::writeImage<PixelType,
CVDimage::writer>(im,o, p); break;
}
}
- template<class PixelType> void img_save(const BasicImage<PixelType>&
im, const std::string& name, ImageType::ImageType t, ImageType::ImageType d =
ImageType::PNM)
+ template<class PixelType> void img_save(const BasicImage<PixelType>&
im, const std::string& name, ImageType::ImageType t, ImageType::ImageType d =
ImageType::PNM, const std::map<std::string, Parameter<> >& p =
std::map<std::string, Parameter<> >())
{
std::ofstream out(name.c_str(), std::ios::out|std::ios::binary);
if(!out.good())
@@ -328,12 +328,12 @@
t = d;
}
- img_save(im, out, t);
+ img_save(im, out, t, p);
}
- template<class PixelType> void img_save(const BasicImage<PixelType>&
im, const std::string& name)
+ template<class PixelType> void img_save(const BasicImage<PixelType>&
im, const std::string& name, const std::map<std::string, Parameter<> >& p =
std::map<std::string, Parameter<> >())
{
- img_save(im, name, ImageType::Automatic);
+ img_save(im, name, ImageType::Automatic, ImageType::PNM, p);
}
////////////////////////////////////////////////////////////////////////////////
Index: cvd/internal/load_and_save.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/load_and_save.h,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- cvd/internal/load_and_save.h 18 Feb 2010 13:30:10 -0000 1.17
+++ cvd/internal/load_and_save.h 21 Mar 2010 19:02:02 -0000 1.18
@@ -22,11 +22,16 @@
#define CVD_LOAD_AND_SAVE_H
#include <iostream>
+#include <string>
+#include <typeinfo>
+#include <map>
+#include <memory>
#include <cvd/exceptions.h>
#include <cvd/image_convert.h>
#include <cvd/colourspace_convert.h>
#include <cvd/internal/convert_pixel_types.h>
#include <cvd/internal/name_CVD_rgb_types.h>
+#include <cvd/internal/io/parameter.h>
namespace CVD {
@@ -130,7 +135,6 @@
}
}
-
namespace Internal
{
template<class C, int i> struct save_default_
@@ -297,9 +301,9 @@
//
template<class Pixel, class ImageWriter, class OutgoingPixel>
struct maybe_process_and_write
{
- static void write(std::ostream& os, const
SubImage<Pixel>& im)
+ static void write(std::ostream& os, const
SubImage<Pixel>& im, const std::map<std::string, Parameter<> >& p)
{
- ImageWriter w(os, im.size(),
CVD::PNM::type_name<OutgoingPixel>::name());
+ ImageWriter w(os, im.size(),
CVD::PNM::type_name<OutgoingPixel>::name(), p);
Image<OutgoingPixel> row(ImageRef(im.size().x,
1));
for(int r=0; r < im.size().y; r++)
@@ -312,17 +316,17 @@
template<class Pixel, class ImageWriter> struct
maybe_process_and_write<Pixel, ImageWriter, Pixel>
{
- static void write(std::ostream& os, const
SubImage<Pixel>& im)
+ static void write(std::ostream& os, const
SubImage<Pixel>& im, const std::map<std::string, Parameter<> >& p)
{
- ImageWriter w(os, im.size(),
CVD::PNM::type_name<Pixel>::name());
+ ImageWriter w(os, im.size(),
CVD::PNM::type_name<Pixel>::name(), p);
for(int r=0; r < im.size().y; r++)
w.write_raw_pixel_line(im[r]);
}
};
- template<class Pixel, class Writer> void writeImage(const
SubImage<Pixel>& im, std::ostream& o)
+ template<class Pixel, class Writer> void writeImage(const
SubImage<Pixel>& im, std::ostream& o, const std::map<std::string, Parameter<>
>& p)
{
- maybe_process_and_write<Pixel, Writer, typename
Writer::template Outgoing<Pixel>::type>::write(o, im);
+ maybe_process_and_write<Pixel, Writer, typename
Writer::template Outgoing<Pixel>::type>::write(o, im, p);
}
Index: cvd/internal/io/cvdimage.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/cvdimage.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd/internal/io/cvdimage.h 18 Feb 2010 13:30:10 -0000 1.2
+++ cvd/internal/io/cvdimage.h 21 Mar 2010 19:02:02 -0000 1.3
@@ -81,7 +81,7 @@
class writer
{
public:
- writer(std::ostream&, ImageRef size, const std::string&
type);
+ writer(std::ostream&, ImageRef size, const std::string&
type, const std::map<std::string, Parameter<> >& p);
~writer();
void write_raw_pixel_line(const byte*);
Index: cvd/internal/io/fits.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/fits.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- cvd/internal/io/fits.h 4 Jun 2009 17:07:50 -0000 1.4
+++ cvd/internal/io/fits.h 21 Mar 2010 19:02:02 -0000 1.5
@@ -155,7 +155,7 @@
class writer
{
public:
- writer(std::ostream&, ImageRef size, const std::string&
type);
+ writer(std::ostream&, ImageRef size, const std::string&
type, const std::map<std::string, Parameter<> >& p);
~writer();
void write_raw_pixel_line(const unsigned char*);
Index: cvd/internal/io/jpeg.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/jpeg.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- cvd/internal/io/jpeg.h 24 Jan 2009 19:30:22 -0000 1.7
+++ cvd/internal/io/jpeg.h 21 Mar 2010 19:02:02 -0000 1.8
@@ -70,7 +70,7 @@
class writer
{
public:
- writer(std::ostream&, ImageRef size, const std::string&
type);
+ writer(std::ostream&, ImageRef size, const std::string&
type, const std::map<std::string, Parameter<> >& p);
~writer();
void write_raw_pixel_line(const byte*);
Index: cvd/internal/io/png.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/png.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cvd/internal/io/png.h 24 Jan 2009 19:30:22 -0000 1.9
+++ cvd/internal/io/png.h 21 Mar 2010 19:02:02 -0000 1.10
@@ -138,7 +138,7 @@
class png_writer
{
public:
- png_writer(std::ostream&, ImageRef size, const std::string&
type);
+ png_writer(std::ostream&, ImageRef size, const std::string&
type, const std::map<std::string, Parameter<> >& p);
~png_writer();
void write_raw_pixel_line(const bool*);
Index: cvd/internal/io/pnm_grok.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/pnm_grok.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- cvd/internal/io/pnm_grok.h 5 Aug 2008 23:54:46 -0000 1.9
+++ cvd/internal/io/pnm_grok.h 21 Mar 2010 19:02:03 -0000 1.10
@@ -167,7 +167,7 @@
class pnm_writer
{
public:
- pnm_writer(std::ostream&, ImageRef size, const
std::string& type);
+ pnm_writer(std::ostream&, ImageRef size, const
std::string& type, const std::map<std::string, Parameter<> >& p);
~pnm_writer();
//void write_raw_pixel_line(const bool*);
Index: cvd/internal/io/save_postscript.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/save_postscript.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- cvd/internal/io/save_postscript.h 24 Jan 2009 19:30:23 -0000 1.2
+++ cvd/internal/io/save_postscript.h 21 Mar 2010 19:02:03 -0000 1.3
@@ -28,6 +28,7 @@
#include <cvd/byte.h>
#include <cvd/rgb.h>
#include <cvd/internal/convert_pixel_types.h>
+#include <cvd/internal/io/parameter.h>
namespace CVD
{
@@ -40,7 +41,7 @@
class writer
{
public:
- writer(std::ostream&, ImageRef size, const std::string&
type);
+ writer(std::ostream&, ImageRef size, const std::string&
type, const std::map<std::string, Parameter<> >& p);
~writer();
void write_raw_pixel_line(const byte*);
@@ -75,7 +76,7 @@
class eps_writer
{
public:
- eps_writer(std::ostream&, ImageRef size, const
std::string& type);
+ eps_writer(std::ostream&, ImageRef size, const
std::string& type, const std::map<std::string, Parameter<> >& p);
~eps_writer();
void write_raw_pixel_line(const byte*);
Index: cvd/internal/io/text.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/text.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- cvd/internal/io/text.h 26 Jan 2009 15:16:41 -0000 1.1
+++ cvd/internal/io/text.h 21 Mar 2010 19:02:03 -0000 1.2
@@ -67,7 +67,7 @@
class writer
{
public:
- writer(std::ostream&, ImageRef size, const std::string&
type);
+ writer(std::ostream&, ImageRef size, const std::string&
type, const std::map<std::string, Parameter<> >& p);
~writer();
void write_raw_pixel_line(const double*);
Index: cvd/internal/io/tiff.h
===================================================================
RCS file: /cvsroot/libcvd/libcvd/cvd/internal/io/tiff.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- cvd/internal/io/tiff.h 24 Jan 2009 19:30:24 -0000 1.11
+++ cvd/internal/io/tiff.h 21 Mar 2010 19:02:03 -0000 1.12
@@ -146,7 +146,7 @@
class tiff_writer
{
public:
- tiff_writer(std::ostream&, ImageRef size, const
std::string& type);
+ tiff_writer(std::ostream&, ImageRef size, const
std::string& type, const std::map<std::string, Parameter<> >& p);
~tiff_writer();
void write_raw_pixel_line(const bool*);
Index: pnm_src/cvdimage.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/cvdimage.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pnm_src/cvdimage.cxx 24 Feb 2010 17:48:45 -0000 1.4
+++ pnm_src/cvdimage.cxx 21 Mar 2010 19:02:03 -0000 1.5
@@ -891,7 +891,7 @@
// Public interfaces to image writing.
//
-writer::writer(ostream& o, ImageRef size, const string& s)
+writer::writer(ostream& o, ImageRef size, const string& s, const
std::map<std::string, Parameter<> >&)
:t(new WritePimpl(o, size.x, size.y, s))
{}
Index: pnm_src/fitswrite.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/fitswrite.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- pnm_src/fitswrite.cc 10 Jun 2009 17:41:45 -0000 1.2
+++ pnm_src/fitswrite.cc 21 Mar 2010 19:02:03 -0000 1.3
@@ -250,7 +250,7 @@
// Implementation of public parts of FITS reading
//
-CVD::FITS::writer::writer(ostream& o, ImageRef size, const string& type)
+CVD::FITS::writer::writer(ostream& o, ImageRef size, const string& type, const
map<string, Parameter<> >&)
:t(new WritePimpl(o, size, type))
{}
Index: pnm_src/jpeg.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/jpeg.cxx,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- pnm_src/jpeg.cxx 24 Jan 2009 19:30:26 -0000 1.13
+++ pnm_src/jpeg.cxx 21 Mar 2010 19:02:03 -0000 1.14
@@ -351,7 +351,7 @@
class WritePimpl
{
public:
- WritePimpl(std::ostream&, int xsize, int ysize, const string& type, const
std::string& comm="");
+ WritePimpl(std::ostream&, int xsize, int ysize, const string& type, const
std::map<std::string, Parameter<> >& p, const std::string& comm="");
int channels(){return m_channels;}
long x_size() const {return xs;}
long y_size() const {return ys;}
@@ -371,7 +371,7 @@
-WritePimpl::WritePimpl(std::ostream& out, int xsize, int ysize, const string&
t, const string& comm)
+WritePimpl::WritePimpl(std::ostream& out, int xsize, int ysize, const string&
t, const std::map<std::string, Parameter<> >& p, const string& comm)
:o(out)
{
xs = xsize;
@@ -412,8 +412,21 @@
cinfo.input_components = m_channels;
cinfo.in_color_space = (m_channels==3) ? JCS_RGB : JCS_GRAYSCALE;
+ int quality = 95;
+ if(p.count("jpeg.quality"))
+ {
+ try{
+ quality = p.find("jpeg.quality")->second.get<int>();
+ quality = max(0,min(100,quality));
+ }
+ catch(std::bad_cast c)
+ {
+ cerr << "Warning jpeg.quality is not an int.\n";
+ }
+ }
+
jpeg_set_defaults(&cinfo);
- jpeg_set_quality(&cinfo, 95, TRUE);
+ jpeg_set_quality(&cinfo, quality, TRUE);
jpeg_start_compress(&cinfo, TRUE);
@@ -476,8 +489,8 @@
// Public interfaces to image writing.
//
-writer::writer(ostream& o, ImageRef size, const string& s)
-:t(new WritePimpl(o, size.x, size.y, s))
+writer::writer(ostream& o, ImageRef size, const string& s, const
std::map<std::string, Parameter<> >& p)
+:t(new WritePimpl(o, size.x, size.y, s, p))
{}
writer::~writer()
Index: pnm_src/png.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/png.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- pnm_src/png.cc 20 Mar 2010 11:38:19 -0000 1.11
+++ pnm_src/png.cc 21 Mar 2010 19:02:03 -0000 1.12
@@ -221,7 +221,7 @@
// PNG writing functions.
//
-png_writer::png_writer(ostream& out, ImageRef sz, const string& type_)
+png_writer::png_writer(ostream& out, ImageRef sz, const string& type_, const
std::map<std::string, Parameter<> >& p)
:row(0),o(out),size(sz),type(type_)
{
//Create required structs
Index: pnm_src/pnm_grok.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/pnm_grok.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- pnm_src/pnm_grok.cxx 29 Aug 2008 22:03:04 -0000 1.12
+++ pnm_src/pnm_grok.cxx 21 Mar 2010 19:02:03 -0000 1.13
@@ -505,7 +505,7 @@
out << size.x << " " << size.y << endl << maxval << endl;
}
- pnm_writer::pnm_writer(std::ostream& out, ImageRef size_, const
std::string& type_)
+ pnm_writer::pnm_writer(std::ostream& out, ImageRef size_, const
std::string& type_, const std::map<std::string, Parameter<> >&)
:row(0),o(out),size(size_),type(type_)
{
Index: pnm_src/save_postscript.cxx
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/save_postscript.cxx,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- pnm_src/save_postscript.cxx 24 Jan 2009 19:30:26 -0000 1.11
+++ pnm_src/save_postscript.cxx 21 Mar 2010 19:02:03 -0000 1.12
@@ -227,7 +227,7 @@
// Public interfaces to image writing.
//
-writer::writer(ostream& o, ImageRef size, const string& s)
+writer::writer(ostream& o, ImageRef size, const string& s, const map<string,
Parameter<> >&)
:t(new WritePimpl(o, size, s))
{}
@@ -252,7 +252,7 @@
return os.str();
}
-eps_writer::eps_writer(ostream& o, ImageRef size, const string& s)
+eps_writer::eps_writer(ostream& o, ImageRef size, const string& s, const
map<string, Parameter<> >&)
:t(new WritePimpl(o, size, s, eps_header(size)))
{}
Index: pnm_src/text_write.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/text_write.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- pnm_src/text_write.cc 26 Jan 2009 15:16:43 -0000 1.1
+++ pnm_src/text_write.cc 21 Mar 2010 19:02:03 -0000 1.2
@@ -81,7 +81,7 @@
unsigned long row;
};
-TEXT::writer::writer(ostream& o, ImageRef size, const string& type)
+TEXT::writer::writer(ostream& o, ImageRef size, const string& type, const
std::map<std::string, Parameter<> >&)
:t(new WritePimpl(o, size, type))
{}
Index: pnm_src/tiffwrite.cc
===================================================================
RCS file: /cvsroot/libcvd/libcvd/pnm_src/tiffwrite.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- pnm_src/tiffwrite.cc 24 Jan 2009 19:30:27 -0000 1.4
+++ pnm_src/tiffwrite.cc 21 Mar 2010 19:02:03 -0000 1.5
@@ -365,7 +365,7 @@
// Implementation of public parts of TIFF reading
//
-tiff_writer::tiff_writer(ostream& o, ImageRef size, const string& type)
+tiff_writer::tiff_writer(ostream& o, ImageRef size, const string& type, const
std::map<std::string, Parameter<> >& p)
:t(new TIFFWritePimpl(o, size, type))
{}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [libcvd-members] libcvd cvd/image_io.h cvd/internal/load_and_sav...,
Edward Rosten <=