On Tue, 13 Sep 2022 22:03:44 GMT, Phil Race <p...@openjdk.org> wrote:
>> I see now that Phil cryptically said: >> >>> Regarding changes in gif + freetype >> diff --git a/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c >> b/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c \ >> \ >> diff --git a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c >> b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c \ >> \ >> Please exclude ALL 3rd party libraries from this PR. >> >> That might be interpreted as stating that `gifdecoder.c` is 3rd party source >> code (although that was by no means clear to me the first time I read it). >> I'll revert the changes in that file, and also >> `src/java.desktop/share/native/libfontmanager/freetypeScaler.c`. > >> I see now that Phil cryptically said: >> >> > Regarding changes in gif + freetype >> > diff --git >> > a/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c >> > b/src/java.desktop/share/native/libawt/awt/image/gif/gifdecoder.c >> > >> > diff --git a/src/java.desktop/share/native/libfontmanager/freetypeScaler.c >> > b/src/java.desktop/share/native/libfontmanager/freetypeScaler.c >> > >> > Please exclude ALL 3rd party libraries from this PR. >> >> That might be interpreted as stating that `gifdecoder.c` is 3rd party source >> code (although that was by no means clear to me the first time I read it). >> I'll revert the changes in that file, and also >> `src/java.desktop/share/native/libfontmanager/freetypeScaler.c`. > > I don't know why I mentioned those two files like that but those particular > two are JDK code so are fair game. > > I did write > "Please exclude ALL 3rd party libraries from this PR." > and later : > "We need to revert the native code changes to "libfreetype". > and those points are correct. > > You did fix the latter, but there are still some 3rd party files in there > that are edited : glext.h, wsutils.h, multiVis.c @prrace I have now reverted the changes to glext.h, wsutils.h and multiVis.c. Is this finally ready for merging? (Going forward, I think we absolutely need to have some way to document in the code tree that certain files is 3rd party, like the UPSTREAM notation I previously suggested, or some variant thereof. This "tribal knowledge" about what is 3rd party is not beneficial to anyone, and only wastes both your and my time...) ------------- PR: https://git.openjdk.org/jdk/pull/8328
