不正GIFチェックを画像取得通信部へ移動

git-svn-id: http://svn.sourceforge.jp/svnroot/tween/trunk@456 e39ad16e-3079-482e-bb30-4b4d378143b6

diff --git a/Tween/Connection/HttpVarious.vb b/Tween/Connection/HttpVarious.vb
index 1365b30..ec09d05 100644 (file)
--- a/Tween/Connection/HttpVarious.vb
+++ b/Tween/Connection/HttpVarious.vb
@@ -26,26 +26,17 @@ Public Class HttpVarious
     End Function
 
     Public Overloads Function GetImage(ByVal url As String) As Image
-        Try
-            Dim req As HttpWebRequest = CreateRequest(GetMethod, New Uri(url), Nothing, False)
-            req.Timeout = 5000
-            Dim img As Bitmap = Nothing
-            Dim ret As HttpStatusCode = GetResponse(req, img, Nothing, False)
-            If ret = HttpStatusCode.OK Then Return img
-            Return Nothing
-        Catch ex As Exception
-            Return Nothing
-        End Try
+        Return GetImage(url, "")
     End Function
 
     Public Overloads Function GetImage(ByVal url As String, ByVal referer As String) As Image
         Try
             Dim req As HttpWebRequest = CreateRequest(GetMethod, New Uri(url), Nothing, False)
-            req.Referer = referer
+            If Not String.IsNullOrEmpty(referer) Then req.Referer = referer
             req.Timeout = 5000
             Dim img As Bitmap = Nothing
             Dim ret As HttpStatusCode = GetResponse(req, img, Nothing, False)
-            If ret = HttpStatusCode.OK Then Return img
+            If ret = HttpStatusCode.OK Then Return CheckValidImage(img)
             Return Nothing
         Catch ex As Exception
             Return Nothing
@@ -123,4 +114,35 @@ Public Class HttpVarious
             Return False
         End Try
     End Function
+
+    Private Function CheckValidImage(ByVal img As Image) As Image
+        If img Is Nothing Then Return Nothing
+
+        If img.RawFormat.Guid = Imaging.ImageFormat.Gif.Guid Then
+            Dim fd As New System.Drawing.Imaging.FrameDimension(img.FrameDimensionsList(0))
+            Dim fd_count As Integer = img.GetFrameCount(fd)
+            If fd_count > 1 Then
+                Try
+                    For i As Integer = 0 To fd_count - 1
+                        img.SelectActiveFrame(fd, i)
+                    Next
+                    Return img
+                Catch ex As Exception
+                    '不正な画像の場合は、bitmapに書き直し
+                    Dim bmp As New Bitmap(48, 48)
+                    Using g As Graphics = Graphics.FromImage(bmp)
+                        g.InterpolationMode = Drawing2D.InterpolationMode.High
+                        g.DrawImage(img, 0, 0, 48, 48)
+                    End Using
+                    img.Dispose()
+                    Return bmp
+                End Try
+            Else
+                Return img
+            End If
+        Else
+            Return img
+        End If
+    End Function
+
 End Class

diff --git a/Tween/MyCommon.vb b/Tween/MyCommon.vb
index b2ddc74..707716f 100644 (file)
--- a/Tween/MyCommon.vb
+++ b/Tween/MyCommon.vb
@@ -542,33 +542,4 @@ retry:
 
     Public fileVersion As String
 
-    Public Function CheckValidImage(ByVal img As Image) As Image
-        If img Is Nothing Then Return Nothing
-
-        If img.RawFormat.Guid = Imaging.ImageFormat.Gif.Guid Then
-            Dim fd As New System.Drawing.Imaging.FrameDimension(img.FrameDimensionsList(0))
-            Dim fd_count As Integer = img.GetFrameCount(fd)
-            If fd_count > 1 Then
-                Try
-                    For i As Integer = 0 To fd_count - 1
-                        img.SelectActiveFrame(fd, i)
-                    Next
-                    Return img
-                Catch ex As Exception
-                    '不正な画像の場合は、bitmapに書き直し
-                    Dim bmp As New Bitmap(48, 48)
-                    Using g As Graphics = Graphics.FromImage(bmp)
-                        g.InterpolationMode = Drawing2D.InterpolationMode.High
-                        g.DrawImage(img, 0, 0, 48, 48)
-                    End Using
-                    img.Dispose()
-                    Return bmp
-                End Try
-            Else
-                Return img
-            End If
-        Else
-            Return img
-        End If
-    End Function
 End Module

diff --git a/Tween/Tween.resx b/Tween/Tween.resx
index ae45a5b..6f972d3 100644 (file)
--- a/Tween/Tween.resx
+++ b/Tween/Tween.resx
@@ -147,25 +147,25 @@
     <value>237, 17</value>
   </metadata>
   <data name="ToolStripMenuItemUrlMultibyteSplit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="ToolStripMenuItemUrlMultibyteSplit.Text" xml:space="preserve">
     <value>URLからの全角文字列の切り離し</value>
   </data>
   <data name="ToolStripMenuItemApiCommandEvasion.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="ToolStripMenuItemApiCommandEvasion.Text" xml:space="preserve">
     <value>APIコマンドを回避する</value>
   </data>
   <data name="ToolStripMenuItemUrlAutoShorten.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="ToolStripMenuItemUrlAutoShorten.Text" xml:space="preserve">
     <value>自動的にURLを短縮する</value>
   </data>
   <data name="IdeographicSpaceToSpaceToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="IdeographicSpaceToSpaceToolStripMenuItem.Text" xml:space="preserve">
     <value>全角スペースを半角スペースにする</value>
@@ -174,19 +174,19 @@
     <value>Ctrl+Y</value>
   </data>
   <data name="MultiLineMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="MultiLineMenuItem.Text" xml:space="preserve">
     <value>発言欄複数行入力(&amp;M)</value>
   </data>
   <data name="ToolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>234, 6</value>
+    <value>277, 6</value>
   </data>
   <data name="HashToggleMenuItem.ShortcutKeys" type="System.Windows.Forms.Keys, System.Windows.Forms">
     <value>Ctrl+Shift+T</value>
   </data>
   <data name="HashToggleMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="HashToggleMenuItem.Text" xml:space="preserve">
     <value>ハッシュタグ自動付加</value>
@@ -195,13 +195,13 @@
     <value>Ctrl+T</value>
   </data>
   <data name="HashManageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+    <value>280, 22</value>
   </data>
   <data name="HashManageMenuItem.Text" xml:space="preserve">
     <value>ハッシュタグ設定</value>
   </data>
   <data name="ContextMenuStripPostMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>238, 164</value>
+    <value>281, 164</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripPostMode.Name" xml:space="preserve">
     <value>ContextMenuStripPostMode</value>
@@ -268,28 +268,28 @@
     <value>411, 54</value>
   </metadata>
   <data name="AddTabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="AddTabMenuItem.Text" xml:space="preserve">
     <value>タブ作成(&amp;N)...</value>
   </data>
   <data name="TabRenameMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="TabRenameMenuItem.Text" xml:space="preserve">
     <value>タブ名の変更(&amp;R)</value>
   </data>
   <data name="ToolStripSeparator20.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 6</value>
+    <value>223, 6</value>
   </data>
   <data name="UreadManageMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="UreadManageMenuItem.Text" xml:space="preserve">
     <value>未読管理(&amp;U)</value>
   </data>
   <data name="NotifyDispMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="NotifyDispMenuItem.Text" xml:space="preserve">
     <value>新着通知表示(&amp;Q)</value>
@@ -301,34 +301,34 @@
     <value>再生するwavファイルを指定してください</value>
   </data>
   <data name="ToolStripSeparator18.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 6</value>
+    <value>223, 6</value>
   </data>
   <data name="FilterEditMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="FilterEditMenuItem.Text" xml:space="preserve">
     <value>振り分けルール編集(&amp;F)...</value>
   </data>
   <data name="ToolStripSeparator19.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 6</value>
+    <value>223, 6</value>
   </data>
   <data name="ClearTabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="ClearTabMenuItem.Text" xml:space="preserve">
     <value>このタブの発言をクリア(&amp;C)</value>
   </data>
   <data name="ToolStripSeparator11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>185, 6</value>
+    <value>223, 6</value>
   </data>
   <data name="DeleteTabMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>188, 22</value>
+    <value>226, 22</value>
   </data>
   <data name="DeleteTabMenuItem.Text" xml:space="preserve">
     <value>タブ削除(&amp;D)</value>
   </data>
   <data name="ContextMenuTabProperty.Size" type="System.Drawing.Size, System.Drawing">
-    <value>189, 206</value>
+    <value>227, 212</value>
   </data>
   <data name="&gt;&gt;ContextMenuTabProperty.Name" xml:space="preserve">
     <value>ContextMenuTabProperty</value>
@@ -457,22 +457,22 @@
     <value>498, 91</value>
   </metadata>
   <data name="IconNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 22</value>
+    <value>136, 22</value>
   </data>
   <data name="IconNameToolStripMenuItem.Text" xml:space="preserve">
     <value>IconName</value>
   </data>
   <data name="ToolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>117, 6</value>
+    <value>133, 6</value>
   </data>
   <data name="SaveIconPictureToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>120, 22</value>
+    <value>136, 22</value>
   </data>
   <data name="SaveIconPictureToolStripMenuItem.Text" xml:space="preserve">
     <value>保存(&amp;I)...</value>
   </data>
   <data name="ContextMenuStrip3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>121, 54</value>
+    <value>137, 54</value>
   </data>
   <data name="&gt;&gt;ContextMenuStrip3.Name" xml:space="preserve">
     <value>ContextMenuStrip3</value>
@@ -550,37 +550,37 @@
     <value>17, 91</value>
   </metadata>
   <data name="FollowToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="FollowToolStripMenuItem.Text" xml:space="preserve">
     <value>フォローする</value>
   </data>
   <data name="UnFollowToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="UnFollowToolStripMenuItem.Text" xml:space="preserve">
     <value>フォロー解除</value>
   </data>
   <data name="ShowFriendShipToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ShowFriendShipToolStripMenuItem.Text" xml:space="preserve">
     <value>相互フォロー状態表示</value>
   </data>
   <data name="ShowUserStatusToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ShowUserStatusToolStripMenuItem.Text" xml:space="preserve">
     <value>プロフィール表示</value>
   </data>
   <data name="SearchPostsDetailNameToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="SearchPostsDetailNameToolStripMenuItem.Text" xml:space="preserve">
     <value>このユーザーの発言を検索</value>
   </data>
   <data name="ContextMenuStripDetailName.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 114</value>
+    <value>221, 114</value>
   </data>
   <data name="&gt;&gt;ContextMenuStripDetailName.Name" xml:space="preserve">
     <value>ContextMenuStripDetailName</value>
@@ -661,16 +661,16 @@
     <value>現在のタブ(&amp;L)</value>
   </data>
   <data name="ToolStripMenuItem2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ToolStripMenuItem2.Text" xml:space="preserve">
     <value>選択文字列で検索(&amp;S)</value>
   </data>
   <data name="ToolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 6</value>
+    <value>217, 6</value>
   </data>
   <data name="ToolStripMenuItem3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ToolStripMenuItem3.Text" xml:space="preserve">
     <value>選択文字列をコピー(&amp;C)</value>
@@ -679,70 +679,70 @@
     <value>False</value>
   </data>
   <data name="ToolStripMenuItem4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ToolStripMenuItem4.Text" xml:space="preserve">
     <value>URLをコピー(&amp;U)</value>
   </data>
   <data name="ToolStripMenuItem5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ToolStripMenuItem5.Text" xml:space="preserve">
     <value>すべて選択(&amp;A)</value>
   </data>
   <data name="ToolStripSeparator5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 6</value>
+    <value>217, 6</value>
   </data>
   <data name="FollowContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="FollowContextMenuItem.Text" xml:space="preserve">
     <value>フォローする(&amp;F)</value>
   </data>
   <data name="RemoveContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="RemoveContextMenuItem.Text" xml:space="preserve">
     <value>フォロー解除(&amp;N)</value>
   </data>
   <data name="FriendshipContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="FriendshipContextMenuItem.Text" xml:space="preserve">
     <value>相互フォロー状態表示(&amp;R)</value>
   </data>
   <data name="ShowUserStatusContextMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="ShowUserStatusContextMenuItem.Text" xml:space="preserve">
     <value>プロフィール表示</value>
   </data>
   <data name="SearchPostsDetailToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="SearchPostsDetailToolStripMenuItem.Text" xml:space="preserve">
     <value>このユーザーの発言を検索</value>
   </data>
   <data name="ToolStripSeparator32.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 6</value>
+    <value>217, 6</value>
   </data>
   <data name="IdFilterAddMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="IdFilterAddMenuItem.Text" xml:space="preserve">
     <value>ID振分ルール作成(&amp;I)</value>
   </data>
   <data name="ToolStripSeparator33.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 6</value>
+    <value>217, 6</value>
   </data>
   <data name="UseHashtagMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
+    <value>220, 22</value>
   </data>
   <data name="UseHashtagMenuItem.Text" xml:space="preserve">
     <value>ハッシュタグを固定(&amp;H)</value>
   </data>
   <data name="ContextMenuStrip4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 270</value>
+    <value>221, 270</value>
   </data>
   <data name="&gt;&gt;ContextMenuStrip4.Name" xml:space="preserve">
     <value>ContextMenuStrip4</value>
@@ -1828,58 +1828,58 @@
     <value>163, 54</value>
   </metadata>
   <data name="ReplyStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ReplyStripMenuItem.Text" xml:space="preserve">
     <value>@返信(&amp;R)</value>
   </data>
   <data name="ReplyAllStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ReplyAllStripMenuItem.Text" xml:space="preserve">
     <value>@返信ALL(&amp;E)</value>
   </data>
   <data name="DMStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="DMStripMenuItem.Text" xml:space="preserve">
     <value>DM送信(&amp;M)</value>
   </data>
   <data name="ReTweetOriginalStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ReTweetOriginalStripMenuItem.Text" xml:space="preserve">
     <value>Re&amp;tweet</value>
   </data>
   <data name="ReTweetStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ReTweetStripMenuItem.Text" xml:space="preserve">
     <value>Retweet(U&amp;nofficial)</value>
   </data>
   <data name="QuoteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="QuoteStripMenuItem.Text" xml:space="preserve">
     <value>&amp;Quote</value>
   </data>
   <data name="ToolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 6</value>
+    <value>199, 6</value>
   </data>
   <data name="FavAddToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="FavAddToolStripMenuItem.Text" xml:space="preserve">
     <value>Fav追加(&amp;F)</value>
   </data>
   <data name="FavRemoveToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="FavRemoveToolStripMenuItem.Text" xml:space="preserve">
     <value>Fav削除(&amp;V)</value>
   </data>
   <data name="ShowProfileMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ShowProfileMenuItem.Text" xml:space="preserve">
     <value>プロフィール表示</value>
@@ -1927,7 +1927,7 @@
     <value>RTした人のホームを開く(&amp;R)</value>
   </data>
   <data name="ToolStripMenuItem6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ToolStripMenuItem6.Text" xml:space="preserve">
     <value>開く(&amp;O)</value>
@@ -1945,13 +1945,13 @@
     <value>ID振り分けルール作成...</value>
   </data>
   <data name="ToolStripMenuItem7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ToolStripMenuItem7.Text" xml:space="preserve">
     <value>振り分けルール作成(&amp;C)</value>
   </data>
   <data name="ToolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 6</value>
+    <value>199, 6</value>
   </data>
   <data name="ReadedStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
     <value>154, 22</value>
@@ -1966,46 +1966,46 @@
     <value>未読にする</value>
   </data>
   <data name="ToolStripMenuItem11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="ToolStripMenuItem11.Text" xml:space="preserve">
     <value>未読状態変更(&amp;H)</value>
   </data>
   <data name="JumpUnreadMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="JumpUnreadMenuItem.Text" xml:space="preserve">
     <value>未読へジャンプ(&amp;J)</value>
   </data>
   <data name="ToolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>179, 6</value>
+    <value>199, 6</value>
   </data>
   <data name="SelectAllMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="SelectAllMenuItem.Text" xml:space="preserve">
     <value>全て選択(&amp;A)</value>
   </data>
   <data name="DeleteStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="DeleteStripMenuItem.Text" xml:space="preserve">
     <value>削除(&amp;D)</value>
   </data>
   <data name="RefreshStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="RefreshStripMenuItem.Text" xml:space="preserve">
     <value>更新(&amp;U)</value>
   </data>
   <data name="RefreshMoreStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>182, 22</value>
+    <value>202, 22</value>
   </data>
   <data name="RefreshMoreStripMenuItem.Text" xml:space="preserve">
     <value>前データを取得(&amp;I)</value>
   </data>
   <data name="ContextMenuStrip2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>183, 396</value>
+    <value>203, 396</value>
   </data>
   <data name="&gt;&gt;ContextMenuStrip2.Name" xml:space="preserve">
     <value>ContextMenuStrip2</value>
@@ -2017,55 +2017,55 @@
     <value>17, 54</value>
   </metadata>
   <data name="SettingStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="SettingStripMenuItem.Text" xml:space="preserve">
     <value>設定(&amp;O)...</value>
   </data>
   <data name="ToolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 6</value>
+    <value>186, 6</value>
   </data>
   <data name="SaveLogMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="SaveLogMenuItem.Text" xml:space="preserve">
     <value>ファイル保存(&amp;S)...</value>
   </data>
   <data name="ToolStripSeparator17.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 6</value>
+    <value>186, 6</value>
   </data>
   <data name="NewPostPopMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="NewPostPopMenuItem.Text" xml:space="preserve">
     <value>新着通知(&amp;Q)</value>
   </data>
   <data name="PlaySoundMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="PlaySoundMenuItem.Text" xml:space="preserve">
     <value>サウンド再生(&amp;P)</value>
   </data>
   <data name="ListLockMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="ListLockMenuItem.Text" xml:space="preserve">
     <value>新着時リスト固定(&amp;L)</value>
   </data>
   <data name="ToolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>165, 6</value>
+    <value>186, 6</value>
   </data>
   <data name="EndToolStripMenuItem.ShowShortcutKeys" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
   <data name="EndToolStripMenuItem.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="EndToolStripMenuItem.Text" xml:space="preserve">
     <value>終了(&amp;X)</value>
   </data>
   <data name="ContextMenuStrip1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>169, 154</value>
+    <value>190, 154</value>
   </data>
   <data name="&gt;&gt;ContextMenuStrip1.Name" xml:space="preserve">
     <value>ContextMenuStrip1</value>

diff --git a/Tween/Tween.vb b/Tween/Tween.vb
index d47e90c..a8e8135 100644 (file)
--- a/Tween/Tween.vb
+++ b/Tween/Tween.vb
@@ -8267,7 +8267,7 @@ RETRY:
                 ' 画像直リンク
                 Dim img As Image = http.GetImage(url.Value, url.Key)
                 If img Is Nothing Then Continue For
-                arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(img)))
+                arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, img))
                 arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
             ElseIf url.Key.StartsWith("http://www.pixiv.net/") Then
                 Dim src As String = ""
@@ -8282,7 +8282,7 @@ RETRY:
                         If _mc.Success Then
                             Dim _img As Image = http.GetImage(_mc.Value, url.Key)
                             If _img Is Nothing Then Continue For
-                            arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                            arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                             arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
                         End If
                     End If
@@ -8297,7 +8297,7 @@ RETRY:
                         If _mc.Count > 1 Then
                             Dim _img As Image = http.GetImage(_mc.Item(1).Value, url.Key)
                             If _img Is Nothing Then Continue For
-                            arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                            arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                             arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
                         End If
                     End If
@@ -8315,7 +8315,7 @@ RETRY:
                             Dim min_img_url As String = r.Replace(_mc.Value, "_0120_0120")
                             Dim _img As Image = http.GetImage(min_img_url, url.Key)
                             If _img Is Nothing Then Continue For
-                            arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                            arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                             arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
                         End If
                     End If
@@ -8338,7 +8338,7 @@ RETRY:
                         If String.IsNullOrEmpty(thumbnail_url) Then Continue For
                         Dim _img As Image = http.GetImage(thumbnail_url, url.Key)
                         If _img Is Nothing Then Continue For
-                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                         arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
                         Continue For
                     End If
@@ -8371,7 +8371,7 @@ RETRY:
                     If Not String.IsNullOrEmpty(imgurl) Then
                         Dim _img As Image = http.GetImage(imgurl, url.Key)
                         If _img Is Nothing Then Continue For
-                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                         arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
                     End If
                 End If
@@ -8479,7 +8479,7 @@ RETRY:
                     If Not String.IsNullOrEmpty(imgurl) Then
                         Dim _img As Image = http.GetImage(imgurl, url.Key)
                         If _img Is Nothing Then Continue For
-                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                         arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, sb.ToString.Trim()))
                     End If
                 End If
@@ -8505,7 +8505,7 @@ RETRY:
                         If String.IsNullOrEmpty(thumbnail_url) Then Continue For
                         Dim _img As Image = http.GetImage(thumbnail_url, url.Key)
                         If _img Is Nothing Then Continue For
-                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(_img)))
+                        arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, _img))
                         arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
                         Continue For
                     End If
@@ -8515,7 +8515,7 @@ RETRY:
                 ' 直リンクでなく、パターンに合致しない
                 Dim img As Image = http.GetImage(url.Value, url.Key)
                 If img Is Nothing Then Continue For
-                arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, CheckValidImage(img)))
+                arg.pics.Add(New KeyValuePair(Of String, Image)(url.Key, img))
                 arg.tooltiptext.Add(New KeyValuePair(Of String, String)(url.Key, ""))
             End If
         Next

diff --git a/Tween/Twitter.vb b/Tween/Twitter.vb
index 43ff2cd..3548293 100644 (file)
--- a/Tween/Twitter.vb
+++ b/Tween/Twitter.vb
@@ -378,7 +378,7 @@ Public Class Twitter
                             g.Dispose()
                         End Using
 
-                        _dIcon.Add(post.ImageUrl, CheckValidImage(img))
+                        _dIcon.Add(post.ImageUrl, img)
                         _lIcon.Images.Add(post.ImageUrl, bmp2)
                         post.ImageIndex = _lIcon.Images.IndexOfKey(post.ImageUrl)
                     Catch ex As InvalidOperationException