Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

fix jpegtran metadata stripping #152

Merged
merged 1 commit into from

2 participants

@rrelmy

The option «-copy» of jpegtran is used in the wrong way.

If stripping metadata is turned on the argument gets the value «all» otherwise «none».
Jpegtran copies the metadata if «all», «none» does omit them.

I renamed the variable «strip-meta-tags» to «retain-meta-tags», that should be more clear

$ jpegtran --help
usage: jpegtran [switches] [inputfile]
Switches (names may be abbreviated):
  -copy none     Copy no extra markers from source file
  -copy comments Copy only comment markers (default)
  -copy all      Copy all extra markers
@roblarsen roblarsen merged commit ce02602 into h5bp:master
@roblarsen
Collaborator

Thanks!

@rrelmy rrelmy deleted the rrelmy:jpegtran-metadata-stripping branch
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Mar 9, 2013
  1. @rrelmy
This page is out of date. Refresh to see the latest.
Showing with 4 additions and 4 deletions.
  1. +4 −4 build.xml
View
8 build.xml
@@ -1129,13 +1129,13 @@
<target name="-imagesjpg" depends="-mkdirs" description="(PRIVATE) Optimizes .jpg images using jpegtan">
<echo message="Now, we clean up those jpgs..."/>
- <!-- By default set strip-meta-tags to none -->
- <var name="strip-meta-tags" value="none"/>
+ <!-- By default set retain-meta-tags to all -->
+ <var name="retain-meta-tags" value="all"/>
<if>
<equals arg1="${images.strip.metadata}" arg2="true"/>
<then>
- <var name="strip-meta-tags" value="all"/>
+ <var name="retain-meta-tags" value="none"/>
</then>
</if>
@@ -1190,7 +1190,7 @@
<apply executable="${jpegtran.executable}" dest="./${dir.publish}/${relative.image.dir}" osfamily="${os.family}">
<fileset dir="${dir.source}/${relative.image.dir}" includes="**/*.jpg" excludes="${images.bypass}, ${images.default.bypass}"/>
<arg value="-copy"/>
- <arg value="${strip-meta-tags}"/>
+ <arg value="${retain-meta-tags}"/>
<arg value="-optimize"/>
<arg value="${images.opts.progressive}"/>
<arg value="-outfile"/>
Something went wrong with that request. Please try again.