[geeklog-cvs] geeklog-1.3/system/classes upload.class.php,1.32,1.33

[dhaun at iowaoutdoors.org]

Update of /var/cvs/geeklog-1.3/system/classes
In directory www:/tmp/cvs-serv5400

Modified Files:
	upload.class.php 
Log Message:
Use pnmtojpeg instead of ppmtojpeg when resizing uploaded images using the NetPBM package (bug #257)


Index: upload.class.php
===================================================================
RCS file: /var/cvs/geeklog-1.3/system/classes/upload.class.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** upload.class.php	10 Jul 2004 17:32:02 -0000	1.32
--- upload.class.php	13 Aug 2004 08:52:06 -0000	1.33
***************
*** 6,11 ****
  // +---------------------------------------------------------------------------+
  // | upload.class.php                                                          |
- // | Geeklog file upload class library.                                        |
  // |                                                                           |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2002-2004 by the following authors:                         |
--- 6,11 ----
  // +---------------------------------------------------------------------------+
  // | upload.class.php                                                          |
  // |                                                                           |
+ // | Geeklog file upload class library.                                        |
  // +---------------------------------------------------------------------------+
  // | Copyright (C) 2002-2004 by the following authors:                         |
***************
*** 548,552 ****
                  } else if (eregi ('\.(jpg|jpeg)', $filename)) {
                      $tmpfile = $this->_fileUploadDirectory . '/tmp.jpg';
!                     $cmd .= 'jpegtopnm ' . $cmd_end . 'ppmtojpeg > ' . $tmpfile;
                  }  else if (eregi ('\.gif', $filename)) {
                      $tmpfile = $this->_fileUploadDirectory . '/tmp.gif';
--- 548,552 ----
                  } else if (eregi ('\.(jpg|jpeg)', $filename)) {
                      $tmpfile = $this->_fileUploadDirectory . '/tmp.jpg';
!                     $cmd .= 'jpegtopnm ' . $cmd_end . 'pnmtojpeg > ' . $tmpfile;
                  }  else if (eregi ('\.gif', $filename)) {
                      $tmpfile = $this->_fileUploadDirectory . '/tmp.gif';