From aff5d127c55a157ac98f735515de0d5466186492 Mon Sep 17 00:00:00 2001
From: syo68k <syo68k@users.sourceforge.jp>
Date: Tue, 20 Jul 2010 15:14:32 +0000
Subject: [PATCH] =?utf8?q?=E7=94=BB=E5=83=8F=E6=8A=95=E7=A8=BF=E3=83=A2?=
 =?utf8?q?=E3=83=BC=E3=83=89=E3=81=A7=E4=B8=8D=E6=AD=A3=E3=81=AAGIF?=
 =?utf8?q?=E3=82=A2=E3=83=8B=E3=83=A1=E7=94=BB=E5=83=8F=E3=82=92=E6=8A=95?=
 =?utf8?q?=E7=A8=BF=E3=81=97=E3=82=88=E3=81=86=E3=81=A8=E3=81=97=E3=81=9F?=
 =?utf8?q?=E5=A0=B4=E5=90=88=E3=81=AB=E8=B5=A4=E3=83=90=E3=83=83=E3=83=86?=
 =?utf8?q?=E3=83=B3=E3=81=AB=E3=81=AA=E3=82=8B=E5=95=8F=E9=A1=8C=E3=82=92?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@608 e39ad16e-3079-482e-bb30-4b4d378143b6
---
 Tween/Connection/HttpVarious.vb | 10 +++++++---
 Tween/Resources/ChangeLog.txt   |  1 +
 Tween/Tween.vb                  |  5 ++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/Tween/Connection/HttpVarious.vb b/Tween/Connection/HttpVarious.vb
index de310276..2c8156ea 100644
--- a/Tween/Connection/HttpVarious.vb
+++ b/Tween/Connection/HttpVarious.vb
@@ -127,7 +127,11 @@ Public Class HttpVarious
         End Try
     End Function
 
-    Private Function CheckValidImage(ByVal img As Image) As Image
+    Public Overloads Function CheckValidImage(ByVal img As Image) As Image
+        Return CheckValidImage(img, 48, 48)
+    End Function
+
+    Public Overloads Function CheckValidImage(ByVal img As Image, ByVal width As Integer, ByVal height As Integer) As Image
         If img Is Nothing Then Return Nothing
 
         If img.RawFormat.Guid = Imaging.ImageFormat.Gif.Guid Then
@@ -141,10 +145,10 @@ Public Class HttpVarious
                     Return img
                 Catch ex As Exception
                     '不正な画像の場合は、bitmapに書き直し
-                    Dim bmp As New Bitmap(48, 48)
+                    Dim bmp As New Bitmap(width, height)
                     Using g As Graphics = Graphics.FromImage(bmp)
                         g.InterpolationMode = Drawing2D.InterpolationMode.High
-                        g.DrawImage(img, 0, 0, 48, 48)
+                        g.DrawImage(img, 0, 0, width, height)
                     End Using
                     img.Dispose()
                     Return bmp
diff --git a/Tween/Resources/ChangeLog.txt b/Tween/Resources/ChangeLog.txt
index c10121f0..556e0f74 100644
--- a/Tween/Resources/ChangeLog.txt
+++ b/Tween/Resources/ChangeLog.txt
@@ -18,6 +18,7 @@
  * 振り分けルール画面でボタン押下可能状態の制御が異常になることがあるバグを修正
  * 画像投稿モード時はSpaceキーによる未読ジャンプを行わないようにした
  * 画像投稿モード時投稿欄に文字列を入力していない場合に投稿しようとするとリロード扱いになっていたのを修正
+ * 画像投稿モードで不正なGIFアニメ画像を投稿しようとした場合に赤バッテンになる問題を修正
 ==== Ver 0.9.4.0(2010/07/15)
  * 認証完了後、自分の発言が片思い表示になるバグ修正
  * ユーザー変更時にフォロワー情報を取得するよう変更
diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index 777280f9..568c2f38 100644
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -9381,7 +9381,10 @@ RETRY:
             End If
 
             Dim fs As New FileStream(ImagefilePathText.Text, FileMode.Open, FileAccess.Read)
-            ImageSelectedPicture.Image = Image.FromStream(fs)
+            ImageSelectedPicture.Image = (New HttpVarious).CheckValidImage( _
+                        Image.FromStream(fs), _
+                        ImageSelectedPicture.Width, _
+                        ImageSelectedPicture.Height)
             fs.Close()
         Catch ex As FileNotFoundException
             ImageSelectedPicture.Image = ImageSelectedPicture.InitialImage
-- 
2.11.0