Author: Tobias Schlitt
Date: 2006-01-13 13:39:30 +0100 (Fri, 13 Jan 2006)
New Revision: 1823
Log:
- Fixed unreported bug in crop filter code, spotted by Bard (thanks!).
Modified:
packages/ConsoleTools/trunk/src/output.php
packages/ConsoleTools/trunk/src/progressbar.php
packages/ConsoleTools/trunk/src/statusbar.php
packages/ConsoleTools/trunk/src/table.php
packages/ImageConversion/trunk/src/filters/imagemagick.php
packages/ImageConversion/trunk/tests/filtersshell_test.php
packages/ImageConversion/trunk/tests/handlershell_test.php
Modified: packages/ConsoleTools/trunk/src/output.php
===================================================================
--- packages/ConsoleTools/trunk/src/output.php 2006-01-13 12:18:27 UTC (rev
1822)
+++ packages/ConsoleTools/trunk/src/output.php 2006-01-13 12:39:30 UTC (rev
1823)
@@ -210,7 +210,7 @@
* @throws ezcBaseValueException
* If a the value for the property options is not an instance of
* ezcConsoleOutputOptions.
- * @throws ezcBasePropertyException
+ * @throws ezcBaseValueException
* If a the value for the property formats is not an instance of
* ezcConsoleOutputFormats.
* @return void
@@ -222,14 +222,14 @@
case 'options':
if ( !( $val instanceof ezcConsoleOutputOptions ) )
{
- throw new ezcBasePropertyException( $key, $val,
'ezcConsoleOutputOptions' );
+ throw new ezcBaseValueException( $key, $val,
'ezcConsoleOutputOptions' );
}
$this->options = $val;
return;
case 'formats':
if ( !( $val instanceof ezcConsoleOutputFormats ) )
{
- throw new ezcBasePropertyException( $key, $val,
'ezcConsoleOutputFormats' );
+ throw new ezcBaseValueException( $key, $val,
'ezcConsoleOutputFormats' );
}
$this->formats = $val;
return;
Modified: packages/ConsoleTools/trunk/src/progressbar.php
===================================================================
--- packages/ConsoleTools/trunk/src/progressbar.php 2006-01-13 12:18:27 UTC
(rev 1822)
+++ packages/ConsoleTools/trunk/src/progressbar.php 2006-01-13 12:39:30 UTC
(rev 1823)
@@ -194,7 +194,7 @@
case 'step':
if ( !is_int( $val ) || $val < 0 )
{
- throw new ezcBasePropertyException( $key, $val, 'int >= 0'
);
+ throw new ezcBaseValueException( $key, $val, 'int >= 0' );
}
break;
default:
Modified: packages/ConsoleTools/trunk/src/statusbar.php
===================================================================
--- packages/ConsoleTools/trunk/src/statusbar.php 2006-01-13 12:18:27 UTC
(rev 1822)
+++ packages/ConsoleTools/trunk/src/statusbar.php 2006-01-13 12:39:30 UTC
(rev 1823)
@@ -128,7 +128,7 @@
case 'failureChar':
if ( strlen( $val ) < 1 )
{
- throw new ezcBasePropertyException( $key, $val, 'string,
not empty' );
+ throw new ezcBaseValueException( $key, $val, 'string, not
empty' );
}
break;
default:
Modified: packages/ConsoleTools/trunk/src/table.php
===================================================================
--- packages/ConsoleTools/trunk/src/table.php 2006-01-13 12:18:27 UTC (rev
1822)
+++ packages/ConsoleTools/trunk/src/table.php 2006-01-13 12:39:30 UTC (rev
1823)
@@ -403,7 +403,7 @@
case 'options':
if ( !( $val instanceof ezcConsoleTableOptions ) )
{
- throw new ezcBasePropertyException( $key, $val,
'ezcConsoleTableOptions' );
+ throw new ezcBaseValueException( $key, $val,
'ezcConsoleTableOptions' );
}
$this->options = $val;
return;
Modified: packages/ImageConversion/trunk/src/filters/imagemagick.php
===================================================================
--- packages/ImageConversion/trunk/src/filters/imagemagick.php 2006-01-13
12:18:27 UTC (rev 1822)
+++ packages/ImageConversion/trunk/src/filters/imagemagick.php 2006-01-13
12:39:30 UTC (rev 1823)
@@ -195,7 +195,7 @@
$this->handler->addFilterOption(
$this->handler->getActiveReference(),
'-crop ',
- abs( $width ).'x'.abs( $height ).$xStart.'x'.$yStart
+ abs( $width ).'x'.abs( $height ).$xStart.$yStart
);
}
Modified: packages/ImageConversion/trunk/tests/filtersshell_test.php
===================================================================
--- packages/ImageConversion/trunk/tests/filtersshell_test.php 2006-01-13
12:18:27 UTC (rev 1822)
+++ packages/ImageConversion/trunk/tests/filtersshell_test.php 2006-01-13
12:39:30 UTC (rev 1823)
@@ -36,9 +36,9 @@
'testColorspaceGrey' => '57d8e16a4a01131fbaecd519162aa095',
'testColorspaceMonochrome' => '53bc6b9f9e012e875b27143bd3e29e21',
'testColorspaceSepia' => '1db4c3a057a2546dd56f0d61f8480911',
- 'testCrop_1' => 'cbba8251105a848860ef111ed20dacf2',
- 'testCrop_2' => 'cbba8251105a848860ef111ed20dacf2',
- 'testCrop_3' => 'aa349d0114ac04540a16f3a77bcd4573',
+ 'testCrop_1' => 'dc5a31eb43e3b5c9edee54d3c24fc7a3',
+ 'testCrop_2' => 'dc5a31eb43e3b5c9edee54d3c24fc7a3',
+ 'testCrop_3' => '524dc9211b054a967db9a444f4b59597',
'testScale' => 'd0969b833c95c0cabb4e5dbf0100eaa7',
'testScaleDown_do' => 'd896401cee2e7e9913fc3e0ac8946d6e',
'testScaleDown_dont' => '902e24014b1d1490a94eaf89be5113a6',
Modified: packages/ImageConversion/trunk/tests/handlershell_test.php
===================================================================
--- packages/ImageConversion/trunk/tests/handlershell_test.php 2006-01-13
12:18:27 UTC (rev 1822)
+++ packages/ImageConversion/trunk/tests/handlershell_test.php 2006-01-13
12:39:30 UTC (rev 1823)
@@ -217,7 +217,7 @@
$this->handler->save( $ref, $dstPath );
$this->assertEquals(
- '4c7c2e2f70f2ea616984afcf471b3ec7',
+ '34d2952b5ca0bdbd897a4ab3265f2a06',
md5_file( $dstPath ),
'Applying multiple filter through handler failed.'
);
--
svn-components mailing list
[email protected]
http://lists.ez.no/mailman/listinfo/svn-components
