Commit cb1cd3b7 authored by Robert Sprowson's avatar Robert Sprowson
Browse files

Reorder evaluation of whether to use built in JPEG decode or djpeg.

Before, the candidate JPEG file was prescanned and a decision made as to whether that was too hard for CFSIjpeg to do or not. This lead to duplicated tests when (a little later on at 'WHEN 3700:') the file is prescanned anyway - plus this implictly encoded the capabilities of CFSIjpeg into the BASIC code.
Now, the CFSIjpeg binary is loaded at the first detection of a JPEG file and the scan done up front using its built in routine.
This isn't a performance penalty since the area (jpeg%) was never freed anyway so there is now no need to load it later, which has the additional benefit that it is now possible to detect CFSIjpeg missing and fall back to djpeg rather than reporting an error.
Fixed an 'end of file' error spotted in testing when djpeg fails to produce an output it does actually create a scrap file of zero length which is now checked for too.

Version 1.30. Tagged as 'ChangeFSI-1_30'
parent b0e374f8
...@@ -48,7 +48,7 @@ MSGS = ${DDIR}.Messages ...@@ -48,7 +48,7 @@ MSGS = ${DDIR}.Messages
# Tools: # Tools:
# #
MKDIR = do mkdir -p MKDIR = do mkdir -p
AWK = GNU.gawk AWK = GNU.gawk
CC = cc CC = cc
C++ = c++ C++ = c++
CP = copy CP = copy
...@@ -11,13 +11,13 @@ ...@@ -11,13 +11,13 @@
GBLS Module_HelpVersion GBLS Module_HelpVersion
GBLS Module_ComponentName GBLS Module_ComponentName
GBLS Module_ComponentPath GBLS Module_ComponentPath
Module_MajorVersion SETS "1.29" Module_MajorVersion SETS "1.30"
Module_Version SETA 129 Module_Version SETA 130
Module_MinorVersion SETS "" Module_MinorVersion SETS ""
Module_Date SETS "24 Oct 2009" Module_Date SETS "06 Nov 2010"
Module_ApplicationDate SETS "24-Oct-09" Module_ApplicationDate SETS "06-Nov-10"
Module_ComponentName SETS "ChangeFSI" Module_ComponentName SETS "ChangeFSI"
Module_ComponentPath SETS "mixed/RiscOS/Sources/Apps/ChangeFSI" Module_ComponentPath SETS "mixed/RiscOS/Sources/Apps/ChangeFSI"
Module_FullVersion SETS "1.29" Module_FullVersion SETS "1.30"
Module_HelpVersion SETS "1.29 (24 Oct 2009)" Module_HelpVersion SETS "1.30 (06 Nov 2010)"
/* (1.29) /* (1.30)
* *
* This file is automatically maintained by srccommit, do not edit manually. * This file is automatically maintained by srccommit, do not edit manually.
* Last processed by srccommit version: 1.1. * Last processed by srccommit version: 1.1.
* *
*/ */
#define Module_MajorVersion_CMHG 1.29 #define Module_MajorVersion_CMHG 1.30
#define Module_MinorVersion_CMHG #define Module_MinorVersion_CMHG
#define Module_Date_CMHG 24 Oct 2009 #define Module_Date_CMHG 06 Nov 2010
#define Module_MajorVersion "1.29" #define Module_MajorVersion "1.30"
#define Module_Version 129 #define Module_Version 130
#define Module_MinorVersion "" #define Module_MinorVersion ""
#define Module_Date "24 Oct 2009" #define Module_Date "06 Nov 2010"
#define Module_ApplicationDate "24-Oct-09" #define Module_ApplicationDate "06-Nov-10"
#define Module_ComponentName "ChangeFSI" #define Module_ComponentName "ChangeFSI"
#define Module_ComponentPath "mixed/RiscOS/Sources/Apps/ChangeFSI" #define Module_ComponentPath "mixed/RiscOS/Sources/Apps/ChangeFSI"
#define Module_FullVersion "1.29" #define Module_FullVersion "1.30"
#define Module_HelpVersion "1.29 (24 Oct 2009)" #define Module_HelpVersion "1.30 (06 Nov 2010)"
#define Module_LibraryVersionInfo "1:29" #define Module_LibraryVersionInfo "1:30"
No preview for this file type
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment