Remove #pragma omp from definition of structure in the header file.

Use #pragma omp relates to code blocks, which is usually not the case
of the header files. Therefore, use in the definition of structure
seems incorrect and may cause FTBFS with some OpenMP implementations.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/2/head
Slávek Banko 3 years ago
parent 2e4e81b25e
commit 05c71a8372
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -48,16 +48,12 @@ endif( WITH_LCMS )
##### check for OpenMP ##### check for OpenMP
if( WITH_OPENMP ) if( WITH_OPENMP )
if( CMAKE_CXX_COMPILER_ID MATCHES "GNU" ) find_package( OpenMP )
find_package( OpenMP ) if( OPENMP_FOUND )
if( OPENMP_FOUND ) set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" )
set( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${OpenMP_C_FLAGS}" ) set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS}" )
else()
tde_message_fatal( "OpenMP is requested, but was not found on your system" )
endif()
else() else()
tde_message_fatal( "OpenMP build is available for the GNU GCC compiler only" ) tde_message_fatal( "OpenMP is requested, but was not found on your system" )
endif() endif()
endif( WITH_OPENMP ) endif( WITH_OPENMP )

@ -104,9 +104,6 @@ typedef struct
colors, colors,
bits, bits,
gamma_corrected; gamma_corrected;
#ifdef _OPENMP
#pragma omp firstprivate(colors,height,width)
#endif
unsigned int data_size; // ðàçìåð ïîëÿ äàííûõ â áàéòàõ unsigned int data_size; // ðàçìåð ïîëÿ äàííûõ â áàéòàõ
unsigned char data[1]; // we'll allocate more! unsigned char data[1]; // we'll allocate more!
}libraw_processed_image_t; }libraw_processed_image_t;
@ -138,9 +135,6 @@ typedef struct
left_margin; left_margin;
ushort iheight, ushort iheight,
iwidth; iwidth;
#ifdef _OPENMP
#pragma omp firstprivate(iheight,iwidth)
#endif
double pixel_aspect; double pixel_aspect;
int flip; int flip;
@ -225,9 +219,6 @@ typedef struct
unsigned shot_select; /* -s */ unsigned shot_select; /* -s */
float bright; /* -b */ float bright; /* -b */
float threshold; /* -n */ float threshold; /* -n */
#ifdef _OPENMP
#pragma omp firstprivate(threshold)
#endif
int half_size; /* -h */ int half_size; /* -h */
int four_color_rgb; /* -f */ int four_color_rgb; /* -f */
int document_mode; /* -d/-D */ int document_mode; /* -d/-D */
@ -281,9 +272,6 @@ typedef struct
libraw_thumbnail_t thumbnail; libraw_thumbnail_t thumbnail;
libraw_masked_t masked_pixels; libraw_masked_t masked_pixels;
ushort (*image)[4] ; ushort (*image)[4] ;
#ifdef _OPENMP
#pragma omp shared(image)
#endif
libraw_output_params_t params; libraw_output_params_t params;
// pointer to LibRaw class for use in C calls // pointer to LibRaw class for use in C calls
void *parent_class; void *parent_class;

Loading…
Cancel
Save