Fresco/Berlin/include/Berlin PNG.hh,1.4,1.5 RasterImpl.hh,1.3,1.4
Nick Lewycky <[email protected]>
| Newsgroups | gmane.comp.video.fresco.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvs/fresco/Fresco/Berlin/include/Berlin
In directory purcel:/tmp/cvs-serv31230/Berlin/include/Berlin
Modified Files:
PNG.hh RasterImpl.hh
Log Message:
Change to the semantics of both Raster::load_pixels and
RasterKit::create_empty_raster.
Index: PNG.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/include/Berlin/PNG.hh,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- PNG.hh 17 Feb 2003 02:05:34 -0000 1.4
+++ PNG.hh 20 Feb 2003 02:36:46 -0000 1.5
@@ -47,7 +47,9 @@
adam7 = PNG_INTERLACE_ADAM7,
last = PNG_INTERLACE_LAST};
PNG();
+ PNG(const Fresco::Raster::Info &);
~PNG();
+ unsigned char **empty();
void clear();
void header(Fresco::Raster::Info &);
Fresco::Raster::Data *marshal(unsigned char *const *);
@@ -57,8 +59,9 @@
unsigned char **);
Fresco::Raster::ColorSeq *pixels(unsigned long, unsigned long, unsigned long,
unsigned long, unsigned char *const *);
- unsigned char **pixels(unsigned long, unsigned long, unsigned long,
- unsigned long, const Fresco::Raster::ColorSeq &);
+ void pixels(unsigned long, unsigned long, unsigned long,
+ unsigned long, const Fresco::Raster::ColorSeq &,
+ unsigned char **);
unsigned char **read(const std::string &);
void write(const std::string &, unsigned char *const *);
private:
Index: RasterImpl.hh
===================================================================
RCS file: /cvs/fresco/Fresco/Berlin/include/Berlin/RasterImpl.hh,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- RasterImpl.hh 29 May 2002 06:49:38 -0000 1.3
+++ RasterImpl.hh 20 Feb 2003 02:36:46 -0000 1.4
@@ -35,7 +35,7 @@
{
public:
- RasterImpl();
+ RasterImpl(const Fresco::Raster::Info &);
RasterImpl(const std::string &file);
virtual ~RasterImpl();
virtual Fresco::Raster::Info header();