[Copter-cvs] copter/src/gfx image.cpp,1.2,1.3 image.hpp,1.1,1.2

[Chong K. X. <des...@us...>]

Update of /cvsroot/copter/copter/src/gfx
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21909/gfx

Modified Files:
	image.cpp image.hpp 
Log Message:

- new style AC_INIT/AM_INIT_AUTOMAKE
- std::vector for Image::my_buffer


Index: image.hpp
===================================================================
RCS file: /cvsroot/copter/copter/src/gfx/image.hpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** image.hpp	23 Feb 2004 18:24:51 -0000	1.1
--- image.hpp	2 May 2004 22:10:43 -0000	1.2
***************
*** 20,23 ****
--- 20,24 ----
  #define COPTER_GFX_IMAGE_HPP
  
+ #include <vector>
  #include <string>
  
***************
*** 47,62 ****
  
          const char *
!         buffer() const { return my_buffer; }
  
          int
!         buffer_length() const { return my_buffer_length; }
  
        private:
  
!         char *my_buffer;
!         int   my_buffer_length;
!         int   my_width;
!         int   my_height;
!         int   my_depth;
  
          void
--- 48,63 ----
  
          const char *
!         buffer() const { return &my_buffer[0]; }
  
          int
!         buffer_length() const { return my_buffer.size(); }
  
        private:
  
!         std::vector<char> my_buffer;
! 
!         int my_width;
!         int my_height;
!         int my_depth;
  
          void

Index: image.cpp
===================================================================
RCS file: /cvsroot/copter/copter/src/gfx/image.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** image.cpp	23 Feb 2004 18:42:09 -0000	1.2
--- image.cpp	2 May 2004 22:10:42 -0000	1.3
***************
*** 28,33 ****
    {
      Image::Image() :
-         my_buffer(0),
-         my_buffer_length(0),
          my_width(0),
          my_height(0),
--- 28,31 ----
***************
*** 36,48 ****
  
      Image::~Image()
!     {
!         _clear();
!     }
      
!     bool Image::load(const std::string& filename)
      {
-         if (my_buffer)
-             _clear();
- 
          try
          {
--- 34,42 ----
  
      Image::~Image()
!     {}
      
!     bool
!     Image::load(const std::string& filename)
      {
          try
          {
***************
*** 53,61 ****
              my_depth  = 32;
  
!             my_buffer_length = my_width * my_height * 4;
!             my_buffer = new char[my_buffer_length];
  
              image.write(0, 0, my_width, my_height, "RGBA", Magick::CharPixel,
!                         my_buffer);
  
              return true;
--- 47,54 ----
              my_depth  = 32;
  
!             my_buffer.resize(my_width * my_height * my_depth/8);
  
              image.write(0, 0, my_width, my_height, "RGBA", Magick::CharPixel,
!                         &my_buffer[0]);
  
              return true;
***************
*** 68,77 ****
      }
  
!     void Image::_clear()
      {
!         delete[] my_buffer;
! 
!         my_buffer = 0;
!         my_buffer_length = 0;
          my_width = 0;
          my_height = 0; 
--- 61,68 ----
      }
  
!     void
!     Image::_clear()
      {
!         my_buffer.clear();
          my_width = 0;
          my_height = 0;