From 542359e993e93b75907b2c2a12da38fe83d5c349 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 13 Jan 2020 18:08:49 +0100 Subject: test/fuzzers/standard_fuzzer.cpp: remove dependency to proj_internal.h --- test/fuzzers/standard_fuzzer.cpp | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/test/fuzzers/standard_fuzzer.cpp b/test/fuzzers/standard_fuzzer.cpp index 29ea50f8..468e8cbb 100644 --- a/test/fuzzers/standard_fuzzer.cpp +++ b/test/fuzzers/standard_fuzzer.cpp @@ -34,7 +34,8 @@ #include #include -#include "proj_internal.h" // For pj_gc_unloadall() +#define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H +#include "proj.h" #include "proj_api.h" /* Standalone build: @@ -105,10 +106,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) { free(buf_dup); pj_free(pj_src); -#ifndef OMIT_DEALLOCATION - pj_gc_unloadall(pj_get_default_ctx()); - pj_deallocate_grids(); -#endif + proj_cleanup(); return 0; } double x = 0, y = 0, z = 9; @@ -135,10 +133,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) free(buf_dup); pj_free(pj_src); pj_free(pj_dst); -#ifndef OMIT_DEALLOCATION - pj_gc_unloadall(pj_get_default_ctx()); - pj_deallocate_grids(); -#endif + proj_cleanup(); return 0; } #ifdef STANDALONE @@ -161,10 +156,7 @@ int LLVMFuzzerTestOneInput(const uint8_t *buf, size_t len) free(buf_dup); pj_free(pj_src); pj_free(pj_dst); -#ifndef OMIT_DEALLOCATION - pj_gc_unloadall(pj_get_default_ctx()); - pj_deallocate_grids(); -#endif + proj_cleanup(); return 0; } -- cgit v1.2.3