Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Useful patches #10

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Useful patches #10

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4d90add
Allow to process images up to 30Kx30K
amadvance Nov 13, 2021
7257b8b
Support a new -s option to allow to configure the tile size
amadvance Nov 13, 2021
1c8fc59
Don't warn for unrecognized format if a tile is missing
amadvance Nov 13, 2021
ef19aa1
Mark the 4 band as Alpha
amadvance Nov 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions stitch.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,14 +176,14 @@ struct image *read_png(char *s, int len) {
int main(int argc, char **argv) {
extern int optind;
extern char *optarg;
int i;
long long i;

char *outfile = NULL;
int tilesize = 256;
int centered = 0;
int outfmt = OUTFMT_PNG;
unsigned int writeworldfile = FALSE;
while ((i = getopt(argc, argv, "o:t:cf:w")) != -1) {
while ((i = getopt(argc, argv, "o:t:cf:ws:")) != -1) {
switch (i) {
case 'o':
outfile = optarg;
Expand All @@ -201,6 +201,10 @@ int main(int argc, char **argv) {
writeworldfile = TRUE;
break;

case 's':
tilesize = atoi(optarg);
break;

case 'f':
if (strcmp(optarg, "png") == 0) {
outfmt = OUTFMT_PNG;
Expand Down Expand Up @@ -288,7 +292,7 @@ int main(int argc, char **argv) {
fprintf(stderr, "==Pixel Size: x:%.17g y:%.17g\n", px, py);

long long dim = (long long) width * height;
if (dim > 10000 * 10000) {
if (dim > 35000 * 35000) {
fprintf(stderr, "that's too big\n");
exit(EXIT_FAILURE);
}
Expand All @@ -297,6 +301,7 @@ int main(int argc, char **argv) {
memset(buf, '\0', dim * 4);
if (buf == NULL) {
fprintf(stderr, "Can't allocate memory for %lld\n", dim * 4);
exit(EXIT_FAILURE);
}

unsigned int tx, ty;
Expand Down Expand Up @@ -375,7 +380,9 @@ int main(int argc, char **argv) {
} else if (data.len >= 2 && memcmp(data.buf, "\xFF\xD8", 2) == 0) {
i = read_jpeg(data.buf, data.len);
} else {
fprintf(stderr, "Don't recognize file format\n");
/* if the tile is missing, don't warn */
if (data.len != 0)
fprintf(stderr, "Don't recognize file format\n");

free(data.buf);
curl_easy_cleanup(curl);
Expand All @@ -390,7 +397,7 @@ int main(int argc, char **argv) {
exit(EXIT_FAILURE);
}

int x, y;
long long x, y;
for (y = 0; y < i->height; y++) {
for (x = 0; x < i->width; x++) {
int xd = x + xoff;
Expand Down Expand Up @@ -487,7 +494,7 @@ int main(int argc, char **argv) {
//TODO : Handle writing to stdout if required

if (outfile != NULL) {
fprintf(stderr, "Output PNG: %s\n", outfile);
fprintf(stderr, "Output TIFF: %s\n", outfile);
TIFF *tif = (TIFF *) 0; /* TIFF-level descriptor */
GTIF *gtif = (GTIF *) 0; /* GeoKey-level descriptor */

Expand Down Expand Up @@ -520,6 +527,10 @@ int main(int argc, char **argv) {
TIFFSetField(tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);
TIFFSetField(tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);

uint16 out[1];
out[0] = EXTRASAMPLE_ASSOCALPHA;
TIFFSetField(tif, TIFFTAG_EXTRASAMPLES, 1, &out );

GTIFKeySet(gtif, GTModelTypeGeoKey, TYPE_SHORT, 1, ModelTypeProjected);
GTIFKeySet(gtif, GTRasterTypeGeoKey, TYPE_SHORT, 1, RasterPixelIsArea);
GTIFKeySet(gtif, GTCitationGeoKey, TYPE_ASCII, 0, "WGS 84 / Pseudo-Mercator");
Expand Down