[PHP-DEV] CVS update: php3/functions From: thies (php-dev <email protected>)
Date: 03/30/99

Date: Tuesday March 30, 1999 @ 6:17
Author: thies

Update of /repository/php3/functions
In directory asf:/u/temp/cvs-serv19335

Modified Files:
        magick.c
Log Message:
slowly getting back at topic...

Index: php3/functions/magick.c
diff -c php3/functions/magick.c:1.7 php3/functions/magick.c:1.8
*** php3/functions/magick.c:1.7 Sun Feb 28 12:25:57 1999
--- php3/functions/magick.c Tue Mar 30 06:17:42 1999
***************
*** 28,34 ****
     +----------------------------------------------------------------------+
   */
  
! /* $Id: magick.c,v 1.7 1999/02/28 17:25:57 rasmus Exp $ */
  
  /* TODO list:
   *
--- 28,34 ----
     +----------------------------------------------------------------------+
   */
  
! /* $Id: magick.c,v 1.8 1999/03/30 11:17:42 thies Exp $ */
  
  /* TODO list:
   *
***************
*** 282,288 ****
          PUTS(MagickVersion);
          PUTS("<BR>\n");
          PUTS(MagickCopyright);
! PUTS("<br>RCS Version: $Id: magick.c,v 1.7 1999/02/28 17:25:57 rasmus Exp $<br>\n");
          php3_printf("<b>Compile Options</b><br><tt>IMAGICK_INCLUDE=%s<br>\n"
          "IMAGICK_LFLAGS=%s<br>\n"
          "IMAGICK_LIBS=%s<br></tt>\n",
--- 282,288 ----
          PUTS(MagickVersion);
          PUTS("<BR>\n");
          PUTS(MagickCopyright);
! PUTS("<br>RCS Version: $Id: magick.c,v 1.8 1999/03/30 11:17:42 thies Exp $<br>\n");
          php3_printf("<b>Compile Options</b><br><tt>IMAGICK_INCLUDE=%s<br>\n"
          "IMAGICK_LFLAGS=%s<br>\n"
          "IMAGICK_LIBS=%s<br></tt>\n",
***************
*** 323,328 ****
--- 323,332 ----
  
          magick_debug(D_IMAGEINFO,"Free ImageInfo %d -> %x",imageinfo->id,imageinfo);
  
+ if (imageinfo->ImageInfo.size) {
+ efree(imageinfo->ImageInfo.size);
+ }
+
          efree(imageinfo);
  }
  
***************
*** 398,411 ****
  
  void php3_ReadMagick(INTERNAL_FUNCTION_PARAMETERS)
  {
! pval *filename;
          magick_imageinfo *imageinfo;
          magick_image *image;
          MAGICK_TLS_VARS;
          
! if (getParameters(ht, 1, &filename) == FAILURE) {
! WRONG_PARAM_COUNT;
! }
          convert_to_string(filename);
  
      if (_php3_check_open_basedir(filename->value.str.val)) {
--- 402,420 ----
  
  void php3_ReadMagick(INTERNAL_FUNCTION_PARAMETERS)
  {
! pval *filename, *size;
          magick_imageinfo *imageinfo;
          magick_image *image;
+ char *sizestr;
          MAGICK_TLS_VARS;
          
! if (getParameters(ht, 2, &filename, &size) == SUCCESS) {
! convert_to_string(size);
! sizestr = estrdup(size->value.str.val);
! } else if (getParameters(ht, 1, &filename) == FAILURE) {
! sizestr = 0;
! }
!
          convert_to_string(filename);
  
      if (_php3_check_open_basedir(filename->value.str.val)) {
***************
*** 425,430 ****
--- 434,441 ----
          magick_debug(D_IMAGEINFO,"New ImageInfo %d -> %x",imageinfo->id,imageinfo);
  
          strcpy(imageinfo->ImageInfo.filename,filename->value.str.val);
+
+ imageinfo->ImageInfo.size = sizestr;
  
          image = emalloc(sizeof(magick_image));
   

--
PHP Development Mailing List   http://www.php.net/
To unsubscribe send an empty message to php-dev-unsubscribe <email protected>
For help: php-dev-help <email protected>