Commit: 07d97e02cd857cf638d1ffdbc10485a8ba3c8c62 - mist (git)

MIST (Media Integration Standard Toolkit)

Commit MetaInfo

• Revision: 07d97e02cd857cf638d1ffdbc10485a8ba3c8c62 (tree)
• Time: 2008-10-15 20:58:33
• Author: Daisuke Deguchi <ddeguchi@nago...>
• Commiter: Daisuke Deguchi

Log Message

[1158]の画像トリミング時に入力と同じ画像サイズを指定すると画像が空になるバグ修正をマージ．

Change Summary

• modified: mist/mist.h

Incremental Difference

--- a/mist/mist.h
+++ b/mist/mist.h
@@ -203,6 +203,7 @@ public:
 		}
 		else if( num_ == num )
 		{
+			out = *this;
 			return( true );
 		}
 
@@ -242,17 +243,29 @@ public:
 		}
 		else
 		{
-			array o( num );
-
-			if( this->trim( o, index, num ) )
+			difference_type num_ = size( );
+			if( num_ <= static_cast< difference_type >( index ) || num_ < static_cast< difference_type >( index + num ) )
+			{
+				return( false );
+			}
+			else if( num_ == num )
 			{
-				swap( o );
-
 				return( true );
 			}
 			else
 			{
-				return( false );
+				array o( num );
+
+				if( this->trim( o, index, num ) )
+				{
+					swap( o );
+
+					return( true );
+				}
+				else
+				{
+					return( false );
+				}
 			}
 		}
 	}
@@ -1098,6 +1111,7 @@ public:
 		}
 		else if( w_ == w && h_ == h )
 		{
+			out = *this;
 			return( true );
 		}
 
@@ -1150,17 +1164,35 @@ public:
 		}
 		else
 		{
-			array2 o;
+			difference_type w_ = this->width( );
+			difference_type h_ = this->width( );
 
-			if( this->trim( o, x, y, w, h ) )
+			if( w_ <= static_cast< difference_type >( x ) || w_ < static_cast< difference_type >( x + w ) )
+			{
+				return( false );
+			}
+			else if( h_ <= static_cast< difference_type >( y ) || h_ < static_cast< difference_type >( y + h ) )
+			{
+				return( false );
+			}
+			else if( w_ == w && h_ == h )
 			{
-				swap( o );
-
 				return( true );
 			}
 			else
 			{
-				return( false );
+				array2 o;
+
+				if( this->trim( o, x, y, w, h ) )
+				{
+					swap( o );
+
+					return( true );
+				}
+				else
+				{
+					return( false );
+				}
 			}
 		}
 	}
@@ -1705,6 +1737,7 @@ public:
 		}
 		else if( w_ == w && h_ == h && d_ == d )
 		{
+			out = *this;
 			return( true );
 		}
 
@@ -1771,17 +1804,39 @@ public:
 		}
 		else
 		{
-			array3 o;
-
-			if( this->trim( o, x, y, z, w, h, d ) )
+			difference_type w_ = this->width( );
+			difference_type h_ = this->width( );
+			difference_type d_ = this->depth( );
+			if( w_ <= static_cast< difference_type >( x ) || w_ < static_cast< difference_type >( x + w ) )
+			{
+				return( false );
+			}
+			else if( h_ <= static_cast< difference_type >( y ) || h_ < static_cast< difference_type >( y + h ) )
+			{
+				return( false );
+			}
+			else if( d_ <= static_cast< difference_type >( z ) || d_ < static_cast< difference_type >( z + d ) )
+			{
+				return( false );
+			}
+			else if( w_ == w && h_ == h && d_ == d )
 			{
-				swap( o );
-
 				return( true );
 			}
 			else
 			{
-				return( false );
+				array3 o;
+
+				if( this->trim( o, x, y, z, w, h, d ) )
+				{
+					swap( o );
+
+					return( true );
+				}
+				else
+				{
+					return( false );
+				}
 			}
 		}
 	}