Permalink
Browse files

Additional fixes to JPEG re-saving on existing images

  • Loading branch information...
1 parent 2fd51f0 commit 8a9f425bafed2a9e78819585a999ee1d5635da94 @tannerhelland committed Oct 4, 2012
Showing with 7 additions and 6 deletions.
  1. +4 −1 Forms/VBP_FormJPEG.frm
  2. +2 −4 Modules/VBP_MenuModule.bas
  3. +1 −1 PhotoDemon.vbp
View
@@ -188,6 +188,9 @@ End Sub
'LOAD form
Private Sub Form_Load()
+ 'Make sure that the proper cursor is set
+ Screen.MousePointer = 0
+
'I've found that pre-existing combo box entries are more user-friendly
CmbSaveQuality.AddItem "Perfect (99)", 0
CmbSaveQuality.AddItem "Excellent (92)", 1
@@ -215,7 +218,7 @@ Private Sub hsQuality_Scroll()
End Sub
Private Sub txtQuality_Change()
- If EntryValid(txtQuality, hsQuality.Min, hsQuality.Max, False, False) Then hsQuality.Value = val(txtQuality)
+ If EntryValid(txtQuality, hsQuality.Min, hsQuality.Max, False, False) Then hsQuality.Value = Val(txtQuality)
End Sub
Private Sub txtQuality_GotFocus()
@@ -168,10 +168,7 @@ Public Function MenuSave(ByVal imageID As Long) As Boolean
'This image has been saved before.
'Check to see if the image is a JPEG. If it is, the user needs to be prompted at least once for a quality setting.
- Dim FileExtension As String
- FileExtension = UCase(GetExtension(pdImages(imageID).LocationOnDisk))
-
- If (FileExtension = "JPG") Or (FileExtension = "JPEG") Or (FileExtension = "JPE") Then
+ If (pdImages(imageID).OriginalFileFormat = 2) And (pdImages(imageID).hasSeenJPEGPrompt = False) Then
MenuSave = PhotoDemon_SaveImage(imageID, pdImages(imageID).LocationOnDisk, True)
Else
MenuSave = PhotoDemon_SaveImage(imageID, pdImages(imageID).LocationOnDisk, False, pdImages(imageID).saveFlag0, pdImages(imageID).saveFlag1)
@@ -268,6 +265,7 @@ Public Function PhotoDemon_SaveImage(ByVal imageID As Long, ByVal dstPath As Str
Case "JPG", "JPEG", "JPE"
If loadRelevantForm = True Then
+ SaveFileName = dstPath
FormJPEG.Show 1, FormMain
'If the dialog was canceled, note it. Otherwise, remember that the user has seen the JPEG save screen at least once.
View
@@ -108,7 +108,7 @@ Description="PhotoDemon"
CompatibleMode="0"
MajorVer=5
MinorVer=1
-RevisionVer=51
+RevisionVer=52
AutoIncrementVer=1
ServerSupportFiles=0
VersionComments="�2000-2012 Tanner Helland - www.tannerhelland.com"

0 comments on commit 8a9f425

Please sign in to comment.