Work at SourceForge, help us to make it a better place! We have an immediate need for a Support Technician in our San Francisco or Denver office.

Close

Diff of /doc/batch-processing/Makefile.flickr.mk [4dcc4c] .. [66d8ca] Maximize Restore

  Switch to side-by-side view

--- a/doc/batch-processing/Makefile.flickr.mk
+++ b/doc/batch-processing/Makefile.flickr.mk
@@ -22,6 +22,7 @@
 include $(PTO).mk
 
 PTO_SGRAPHIC = $(EQUIRECT_PREFIX)-sgraphic.pto
+PTO_MERCATOR = $(EQUIRECT_PREFIX)-mercator.pto
 
 SKY_PREFIX = $(EQUIRECT_PREFIX)-sky
 PTO_SKY = $(SKY_PREFIX).pto
@@ -33,12 +34,18 @@
 TIFF_PLANET = $(PLANET_PREFIX)_0000.tif
 JPEG_PLANET = $(PLANET_PREFIX).jpg
 
+MERCATOR_PREFIX = $(EQUIRECT_PREFIX)-mercator
+PTO_MERCATOR = $(MERCATOR_PREFIX).pto
+TIFF_MERCATOR = $(MERCATOR_PREFIX)_0000.tif
+JPEG_MERCATOR = $(MERCATOR_PREFIX).jpg
+
 .PHONY : flickr sky planet flickr_clean
 .SECONDARY : $(LDR_EXPOSURE_LAYERS_REMAPPED) $(LDR_STACKS) $(LDR_LAYERS)
 
 flickr : sky planet
 sky : $(JPEG_SKY)
 planet : $(JPEG_PLANET)
+mercator : $(JPEG_MERCATOR)
 
 $(PTO_SGRAPHIC) : $(EQUIRECT_PREFIX).tif
 	erect2planet $(EQUIRECT_PREFIX).tif
@@ -66,6 +73,17 @@
 	$(EXIFTOOL) -overwrite_original_in_place -TagsFromFile $(INPUT_IMAGE_1) $(EXIFTOOL_COPY_ARGS) $(JPEG_PLANET)
 
 
+$(PTO_MERCATOR) : $(EQUIRECT_PREFIX).tif
+	erect2mercator $(EQUIRECT_PREFIX).tif
+
+$(TIFF_MERCATOR) : $(PTO_MERCATOR)
+	$(NONA) -r ldr -m TIFF_m -i 0 -o $(MERCATOR_PREFIX)_ $(PTO_MERCATOR)
+
+$(JPEG_MERCATOR) : $(TIFF_MERCATOR)
+	convert -geometry $(FLICKR_GEOMETRY) -quality $(JPEG_QUALITY) $(TIFF_MERCATOR) $(JPEG_MERCATOR)
+	$(EXIFTOOL) -overwrite_original_in_place -TagsFromFile $(INPUT_IMAGE_1) $(EXIFTOOL_COPY_ARGS) $(JPEG_MERCATOR)
+
+
 flickr_clean :
-	$(RM) $(TIFF_SKY) $(TIFF_PLANET)
+	$(RM) -f $(TIFF_SKY) $(TIFF_PLANET) $(TIFF_MERCATOR)