summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Pena <npm@chromium.org>2017-02-27 15:56:05 -0500
committerChromium commit bot <commit-bot@chromium.org>2017-02-27 21:58:05 +0000
commitce32acfa15071e6cd5bcce73280857014e396dd2 (patch)
treeae85d62e83da0ef0e9e9b7e05bf71c335764b3ad
parent4e3f2d2a00892e0ef7cd121c6397f0cbb059cf72 (diff)
downloadpdfium-ce32acfa15071e6cd5bcce73280857014e396dd2.tar.xz
Spacing nit in libtiff patch
Original patch: https://pdfium-review.googlesource.com/c/2830/ Procedure: revert original patch, cherry-pick it, fix spacing, use git diff to obtain the new patch file (index changed). Change-Id: I1b5d2fd3cc17780c9428417fb1cd1e6b9a05f1fc Reviewed-on: https://pdfium-review.googlesource.com/2848 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Nicolás Peña <npm@chromium.org>
-rw-r--r--third_party/libtiff/0021-fix-leaks-ojpegreaderinfosectables.patch8
-rw-r--r--third_party/libtiff/tif_ojpeg.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/third_party/libtiff/0021-fix-leaks-ojpegreaderinfosectables.patch b/third_party/libtiff/0021-fix-leaks-ojpegreaderinfosectables.patch
index 13aef44d91..e3b4bd8964 100644
--- a/third_party/libtiff/0021-fix-leaks-ojpegreaderinfosectables.patch
+++ b/third_party/libtiff/0021-fix-leaks-ojpegreaderinfosectables.patch
@@ -1,12 +1,12 @@
diff --git a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c
-index f69b00148..1a700d5bc 100644
+index f69b00148..276d562df 100644
--- a/third_party/libtiff/tif_ojpeg.c
+++ b/third_party/libtiff/tif_ojpeg.c
@@ -1794,6 +1794,8 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
_TIFFfree(ob);
return(0);
}
-+ if(sp->qtable[m]!=0)
++ if (sp->qtable[m]!=0)
+ _TIFFfree(sp->qtable[m]);
sp->qtable[m]=ob;
sp->sof_tq[m]=m;
@@ -15,7 +15,7 @@ index f69b00148..1a700d5bc 100644
_TIFFfree(rb);
return(0);
}
-+ if(sp->dctable[m]!=0)
++ if (sp->dctable[m]!=0)
+ _TIFFfree(sp->dctable[m]);
sp->dctable[m]=rb;
sp->sos_tda[m]=(m<<4);
@@ -24,7 +24,7 @@ index f69b00148..1a700d5bc 100644
_TIFFfree(rb);
return(0);
}
-+ if(sp->actable[m])
++ if (sp->actable[m])
+ _TIFFfree(sp->actable[m]);
sp->actable[m]=rb;
sp->sos_tda[m]=(sp->sos_tda[m]|m);
diff --git a/third_party/libtiff/tif_ojpeg.c b/third_party/libtiff/tif_ojpeg.c
index 1a700d5bc2..276d562dfb 100644
--- a/third_party/libtiff/tif_ojpeg.c
+++ b/third_party/libtiff/tif_ojpeg.c
@@ -1794,7 +1794,7 @@ OJPEGReadHeaderInfoSecTablesQTable(TIFF* tif)
_TIFFfree(ob);
return(0);
}
- if(sp->qtable[m]!=0)
+ if (sp->qtable[m]!=0)
_TIFFfree(sp->qtable[m]);
sp->qtable[m]=ob;
sp->sof_tq[m]=m;
@@ -1863,7 +1863,7 @@ OJPEGReadHeaderInfoSecTablesDcTable(TIFF* tif)
_TIFFfree(rb);
return(0);
}
- if(sp->dctable[m]!=0)
+ if (sp->dctable[m]!=0)
_TIFFfree(sp->dctable[m]);
sp->dctable[m]=rb;
sp->sos_tda[m]=(m<<4);
@@ -1932,7 +1932,7 @@ OJPEGReadHeaderInfoSecTablesAcTable(TIFF* tif)
_TIFFfree(rb);
return(0);
}
- if(sp->actable[m])
+ if (sp->actable[m])
_TIFFfree(sp->actable[m]);
sp->actable[m]=rb;
sp->sos_tda[m]=(sp->sos_tda[m]|m);