2003-11-02

Author: makiuchi-d

delogo.cpp

@@ -122,12 +122,13 @@ PVideoFrame __stdcall EraseLOGO_YUY2::GetFrame(int n, IScriptEnvironment *env)
 	env->MakeWritable(&frame);
 
 	BYTE* dst = frame->GetWritePtr();
-	const int dst_w = frame->GetRowSize();
-	const int dst_h = frame->GetHeight();
+	const int dst_w     = frame->GetRowSize();
+	const int dst_pitch = frame->GetPitch();
+	const int dst_h     = frame->GetHeight();
 
 	LOGO_PIXEL_YUY2* lgp = (LOGO_PIXEL_YUY2*)(lgh +1);
 
-	dst += lgh->x * 2 + lgh->y * dst_w;
+	dst += lgh->x * 2 + lgh->y * dst_pitch;
 
 	for(int i=0;i<lgh->h && i<dst_h-lgh->y;i++){
 		for(int j=0;j<lgh->w && j<dst_w/2-lgh->x;j+=2){
@@ -154,7 +155,7 @@ PVideoFrame __stdcall EraseLOGO_YUY2::GetFrame(int n, IScriptEnvironment *env)
 			dst += 4;
 			lgp += 1;
 		}
-		dst += dst_w - j * 2;
+		dst += dst_pitch - j * 2;
 		lgp += (lgh->w - j)/2;
 	}
 
@@ -176,11 +177,12 @@ PVideoFrame __stdcall AddLOGO_YUY2::GetFrame(int n, IScriptEnvironment *env)
 
 	BYTE* dst = frame->GetWritePtr();
 	const int dst_w = frame->GetRowSize();
+	const int dst_pitch = frame->GetPitch();
 	const int dst_h = frame->GetHeight();
 
 	LOGO_PIXEL_YUY2* lgp = (LOGO_PIXEL_YUY2*)(lgh +1);
 
-	dst += lgh->x * 2 + lgh->y * dst_w;
+	dst += lgh->x * 2 + lgh->y * dst_pitch;
 
 	for(int i=0;i<lgh->h && i<dst_h-lgh->y;i++){
 		for(int j=0;j<lgh->w && j<dst_w/2-lgh->x;j+=2){
@@ -195,8 +197,8 @@ PVideoFrame __stdcall AddLOGO_YUY2::GetFrame(int n, IScriptEnvironment *env)
 			dst += 4;
 			lgp += 1;
 		}
-		dst += dst_w - j * 2;
-		lgp += (lgh->w - j)/2;;
+		dst += dst_pitch - j * 2;
+		lgp += (lgh->w - j)/2;
 	}
 	return frame;
 }
@@ -309,14 +311,14 @@ void deLOGO_Base::AdjustLogo(int x,int y,int depth)
 		adjx = x % 4;
 	} else {
 		adjdata->x = data->x + int((x-3)/4);
-		adjx = 4 - (-x%4);
+		adjx = (4 + (x%4)) %4;
 	}
 	if(y>=0){
 		adjdata->y = data->y + int(y/4);
 		adjy = y % 4;
 	} else {
 		adjdata->y = data->y + int((y-3)/4);
-		adjy = 4 - (-y%4);
+		adjy = (4 + (y%4)) %4;
 	}
 
 	adjdata->w = w = data->w + 1;	// 1/4単位調整するため

delogo.rc

@@ -1,7 +1,7 @@
 //Microsoft Developer Studio generated resource script.
 //
 #include "resource.h"
-#define VS_VERSION_INFO 1
+
 #define APSTUDIO_READONLY_SYMBOLS
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -28,7 +28,7 @@ LANGUAGE LANG_JAPANESE, SUBLANG_DEFAULT
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 0,0,1,2
+ FILEVERSION 0,0,1,3
  PRODUCTVERSION 0,0,1,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
@@ -42,21 +42,21 @@ VS_VERSION_INFO VERSIONINFO
 BEGIN
     BLOCK "StringFileInfo"
     BEGIN
-        BLOCK "041104b0"
+        BLOCK "041104c0"
         BEGIN
-            VALUE "Comments", "YUY2��p"
+            VALUE "Comments", "YUY2��p\0"
             VALUE "FileDescription", "���ߐ����S �t�B���^ Plugin for AviSynth 2.5\0"
-            VALUE "FileVersion", "0.0.1.2\0"
+            VALUE "FileVersion", "0.0.1.3\0"
             VALUE "InternalName", "deLogo\0"
             VALUE "LegalCopyright", "(C) MakKi\0"
             VALUE "OriginalFilename", "delogo.dll\0"
             VALUE "ProductName", "���ߐ����S �t�B���^\0"
-            VALUE "ProductVersion", "0.01b\0"
+            VALUE "ProductVersion", "0.01c\0"
         END
     END
     BLOCK "VarFileInfo"
     BEGIN
-        VALUE "Translation", 0x411, 1200
+        VALUE "Translation", 0x411, 1216
     END
 END
 

readme.txt

@@ -1,5 +1,5 @@
 -----------------------------------------------------------------------
-      ���ߐ����S �t�B���^ for AviSynth 2.5  ver 0.01b  by MakKi
+      ���ߐ����S �t�B���^ for AviSynth 2.5  ver 0.01c  by MakKi
 -----------------------------------------------------------------------
 
 �y�@�\�z
@@ -60,6 +60,8 @@
 
 �y�X�V�����z
 
+  2003/11/02   ver 0.01c �Epos_x,pos_y�̋������������������̂��C��
+                         �ECrop���Ă��鎞���S�������o�O�C��
   2003/11/01   ver 0.01b �Epos_x,pos_y�ɕ��̒l�����Ă��������ɂȂ��Ă����o�O�C��
   2003/10/26   ver 0.01a �Epos_x,pos_y��-200�����̎��G���[�ɂȂ邱�Ƃ��������̂��C��
   2003/10/01   ver 0.01  �E���J