diff options
| author | TDE Weblate <[email protected]> | 2025-03-15 13:04:23 +0000 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2025-03-19 13:12:11 +0900 |
| commit | 8b3a88df55c67e3e75b93385db1c4f27f409a06f (patch) | |
| tree | 8427cf9e4892c66674645e7152c3246a334bd165 | |
| parent | 0b5e696d79ab1a160293d520b7526e031238989a (diff) | |
| download | digikam-8b3a88df55c67e3e75b93385db1c4f27f409a06f.tar.gz digikam-8b3a88df55c67e3e75b93385db1c4f27f409a06f.zip | |
Update translation filesrename/true-false
Updated by "Update PO files to match POT (msgmerge)" hook in Weblate.
Translation: applications/digikam
Translate-URL: https://mirror.git.trinitydesktop.org/weblate/projects/applications/digikam/
45 files changed, 424 insertions, 424 deletions
diff --git a/src/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c b/src/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c index d9baaa3f..6ee70b8e 100644 --- a/src/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c +++ b/src/imageplugins/coreplugin/sharpnesseditor/clapack/lsame.c @@ -11,7 +11,7 @@ logical lsame_(char *ca, char *cb) Purpose ======= - LSAME returns .TRUE. if CA is the same letter as CB regardless of + LSAME returns .true. if CA is the same letter as CB regardless of case. Arguments diff --git a/src/libs/dimg/loaders/iccjpeg.c b/src/libs/dimg/loaders/iccjpeg.c index fefa9509..b6e2f447 100644 --- a/src/libs/dimg/loaders/iccjpeg.c +++ b/src/libs/dimg/loaders/iccjpeg.c @@ -168,8 +168,8 @@ marker_is_icc (jpeg_saved_marker_ptr marker) * See if there was an ICC profile in the JPEG file being read; * if so, reassemble and return the profile data. * - * TRUE is returned if an ICC profile was found, FALSE if not. - * If TRUE is returned, *icc_data_ptr is set to point to the + * true is returned if an ICC profile was found, false if not. + * If true is returned, *icc_data_ptr is set to point to the * returned data, and *icc_data_len is set to its length. * * IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() @@ -180,7 +180,7 @@ marker_is_icc (jpeg_saved_marker_ptr marker) * will prefer to have the data stick around after decompression finishes.) * * NOTE: if the file contains invalid ICC APP2 markers, we just silently - * return FALSE. You might want to issue an error message instead. + * return false. You might want to issue an error message instead. */ boolean @@ -198,7 +198,7 @@ read_icc_profile (j_decompress_ptr cinfo, unsigned int data_length[MAX_SEQ_NO+1]; /* size of profile data in marker */ unsigned int data_offset[MAX_SEQ_NO+1]; /* offset for data in marker */ - *icc_data_ptr = NULL; /* avoid confusion if FALSE return */ + *icc_data_ptr = NULL; /* avoid confusion if false return */ *icc_data_len = 0; /* This first pass over the saved markers discovers whether there are @@ -213,19 +213,19 @@ read_icc_profile (j_decompress_ptr cinfo, if (num_markers == 0) num_markers = GETJOCTET(marker->data[13]); else if (num_markers != GETJOCTET(marker->data[13])) - return FALSE; /* inconsistent num_markers fields */ + return false; /* inconsistent num_markers fields */ seq_no = GETJOCTET(marker->data[12]); if (seq_no <= 0 || seq_no > num_markers) - return FALSE; /* bogus sequence number */ + return false; /* bogus sequence number */ if (marker_present[seq_no]) - return FALSE; /* duplicate sequence numbers */ + return false; /* duplicate sequence numbers */ marker_present[seq_no] = 1; data_length[seq_no] = marker->data_length - ICC_OVERHEAD_LEN; } } if (num_markers == 0) - return FALSE; + return false; /* Check for missing markers, count total space needed, * compute offset of each marker's part of the data. @@ -234,18 +234,18 @@ read_icc_profile (j_decompress_ptr cinfo, total_length = 0; for (seq_no = 1; seq_no <= num_markers; seq_no++) { if (marker_present[seq_no] == 0) - return FALSE; /* missing sequence number */ + return false; /* missing sequence number */ data_offset[seq_no] = total_length; total_length += data_length[seq_no]; } if (total_length <= 0) - return FALSE; /* found only empty markers? */ + return false; /* found only empty markers? */ /* Allocate space for assembled data */ icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET)); if (icc_data == NULL) - return FALSE; /* oops, out of memory */ + return false; /* oops, out of memory */ /* and fill it in */ for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) { @@ -266,5 +266,5 @@ read_icc_profile (j_decompress_ptr cinfo, *icc_data_ptr = icc_data; *icc_data_len = total_length; - return TRUE; + return true; } diff --git a/src/libs/dimg/loaders/iccjpeg.h b/src/libs/dimg/loaders/iccjpeg.h index 2aab4196..a31bd938 100644 --- a/src/libs/dimg/loaders/iccjpeg.h +++ b/src/libs/dimg/loaders/iccjpeg.h @@ -82,8 +82,8 @@ extern void setup_read_icc_profile JPP((j_decompress_ptr cinfo)); * See if there was an ICC profile in the JPEG file being read; * if so, reassemble and return the profile data. * - * TRUE is returned if an ICC profile was found, FALSE if not. - * If TRUE is returned, *icc_data_ptr is set to point to the + * true is returned if an ICC profile was found, false if not. + * If true is returned, *icc_data_ptr is set to point to the * returned data, and *icc_data_len is set to its length. * * IMPORTANT: the data at **icc_data_ptr has been allocated with malloc() diff --git a/src/libs/greycstoration/CImg.h b/src/libs/greycstoration/CImg.h index 9f6662e1..e7565392 100644 --- a/src/libs/greycstoration/CImg.h +++ b/src/libs/greycstoration/CImg.h @@ -2355,7 +2355,7 @@ namespace cimg_library { #elif cimg_display==2 struct Win32info { HANDLE wait_event; - Win32info() { wait_event = CreateEvent(0,FALSE,FALSE,0); } + Win32info() { wait_event = CreateEvent(0,false,false,0); } }; #if defined(cimg_module) Win32info& Win32attr(); @@ -4518,7 +4518,7 @@ namespace cimg_library { si.cb = sizeof(si); si.wShowWindow = SW_HIDE; si.dwFlags |= SW_HIDE; - const BOOL res = CreateProcess((LPCTSTR)module_name,(LPTSTR)command,0,0,FALSE,0,0,0,&si,&pi); + const bool res = CreateProcess((LPCTSTR)module_name,(LPTSTR)command,0,0,false,0,0,0,&si,&pi); if (res) { WaitForSingleObject(pi.hProcess, INFINITE); CloseHandle(pi.hThread); @@ -8516,8 +8516,8 @@ namespace cimg_library { SetEvent(cimg::Win32attr().wait_event); break; case WM_SETCURSOR : - if (disp->visible_cursor) ShowCursor(TRUE); - else ShowCursor(FALSE); + if (disp->visible_cursor) ShowCursor(true); + else ShowCursor(false); break; } return DefWindowProc(window,msg,wParam,lParam); @@ -8659,8 +8659,8 @@ namespace cimg_library { ((void**)arg)[0]=(void*)this; ((void**)arg)[1]=(void*)title; unsigned long ThreadID = 0; - mutex = CreateMutex(0,FALSE,0); - created = CreateEvent(0,FALSE,FALSE,0); + mutex = CreateMutex(0,false,0); + created = CreateEvent(0,false,false,0); thread = CreateThread(0,0,_events_thread,arg,0,&ThreadID); WaitForSingleObject(created,INFINITE); return *this; @@ -8810,7 +8810,7 @@ namespace cimg_library { CImgDisplay& show_mouse() { if (is_empty()) return *this; visible_cursor = true; - ShowCursor(TRUE); + ShowCursor(true); SendMessage(window,WM_SETCURSOR,0,0); return *this; } @@ -8818,7 +8818,7 @@ namespace cimg_library { CImgDisplay& hide_mouse() { if (is_empty()) return *this; visible_cursor = false; - ShowCursor(FALSE); + ShowCursor(false); SendMessage(window,WM_SETCURSOR,0,0); return *this; } @@ -29236,7 +29236,7 @@ namespace cimg_library { cinfo.err = jpeg_std_error(&jerr); jpeg_create_decompress(&cinfo); jpeg_stdio_src(&cinfo,nfile); - jpeg_read_header(&cinfo,TRUE); + jpeg_read_header(&cinfo,true); jpeg_start_decompress(&cinfo); if (cinfo.output_components!=1 && cinfo.output_components!=3 && cinfo.output_components!=4) { @@ -31544,8 +31544,8 @@ namespace cimg_library { cinfo.input_components = dimbuf; cinfo.in_color_space = colortype; jpeg_set_defaults(&cinfo); - jpeg_set_quality(&cinfo,quality<100?quality:100,TRUE); - jpeg_start_compress(&cinfo,TRUE); + jpeg_set_quality(&cinfo,quality<100?quality:100,true); + jpeg_start_compress(&cinfo,true); const unsigned int row_stride = width*dimbuf; JSAMPROW row_pointer[1]; diff --git a/src/libs/greycstoration/greycstoration.h b/src/libs/greycstoration/greycstoration.h index 36b2c0e2..2076e66d 100644 --- a/src/libs/greycstoration/greycstoration.h +++ b/src/libs/greycstoration/greycstoration.h @@ -327,7 +327,7 @@ static void greycstoration_mutex_create(_greycstoration_params &p) { p.mutex = new pthread_mutex_t; pthread_mutex_init(p.mutex,0); #elif cimg_OS==2 - p.mutex = CreateMutex(0,FALSE,0); + p.mutex = CreateMutex(0,false,0); #endif } } diff --git a/src/libs/jpegutils/jpegint.h b/src/libs/jpegutils/jpegint.h index bf01aa3e..e505632f 100644 --- a/src/libs/jpegutils/jpegint.h +++ b/src/libs/jpegutils/jpegint.h @@ -103,7 +103,7 @@ struct jpeg_downsampler { JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)); - boolean need_context_rows; /* TRUE if need rows above & below */ + boolean need_context_rows; /* true if need rows above & below */ }; /* Forward DCT (also controls coefficient quantization) */ @@ -245,7 +245,7 @@ struct jpeg_upsampler { JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)); - boolean need_context_rows; /* TRUE if need rows above & below */ + boolean need_context_rows; /* true if need rows above & below */ }; /* Colorspace conversion */ @@ -512,7 +512,7 @@ struct jpeg_downsampler { JSAMPIMAGE output_buf, JDIMENSION out_row_group_index)); - boolean need_context_rows; /* TRUE if need rows above & below */ + boolean need_context_rows; /* true if need rows above & below */ }; /* Forward DCT (also controls coefficient quantization) */ @@ -630,7 +630,7 @@ struct jpeg_entropy_decoder { /* This is here to share code between baseline and progressive decoders; */ /* other modules probably should not use it */ - boolean insufficient_data; /* set TRUE after emitting warning */ + boolean insufficient_data; /* set true after emitting warning */ }; /* Inverse DCT (also performs dequantization) */ @@ -656,7 +656,7 @@ struct jpeg_upsampler { JDIMENSION *out_row_ctr, JDIMENSION out_rows_avail)); - boolean need_context_rows; /* TRUE if need rows above & below */ + boolean need_context_rows; /* true if need rows above & below */ }; /* Colorspace conversion */ diff --git a/src/libs/jpegutils/transupp.cpp b/src/libs/jpegutils/transupp.cpp index 47a9aa8b..487dcdb2 100644 --- a/src/libs/jpegutils/transupp.cpp +++ b/src/libs/jpegutils/transupp.cpp @@ -108,11 +108,11 @@ do_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y + y_crop_blocks, - (JDIMENSION) compptr->v_samp_factor, FALSE); + (JDIMENSION) compptr->v_samp_factor, false); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { jcopy_block_row(src_buffer[offset_y] + x_crop_blocks, dst_buffer[offset_y], @@ -154,7 +154,7 @@ do_flip_h_no_crop (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, blk_y += compptr->v_samp_factor) { buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { /* Do the mirroring */ for (blk_x = 0; blk_x * 2 < comp_width; blk_x++) { @@ -221,11 +221,11 @@ do_flip_h (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y + y_crop_blocks, - (JDIMENSION) compptr->v_samp_factor, FALSE); + (JDIMENSION) compptr->v_samp_factor, false); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { dst_row_ptr = dst_buffer[offset_y]; src_row_ptr = src_buffer[offset_y]; @@ -286,20 +286,20 @@ do_flip_v (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); if (y_crop_blocks + dst_blk_y < comp_height) { /* Row is within the mirrorable area. */ src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], comp_height - y_crop_blocks - dst_blk_y - (JDIMENSION) compptr->v_samp_factor, - (JDIMENSION) compptr->v_samp_factor, FALSE); + (JDIMENSION) compptr->v_samp_factor, false); } else { /* Bottom-edge blocks will be copied verbatim. */ src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y + y_crop_blocks, - (JDIMENSION) compptr->v_samp_factor, FALSE); + (JDIMENSION) compptr->v_samp_factor, false); } for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { if (y_crop_blocks + dst_blk_y < comp_height) { @@ -358,14 +358,14 @@ do_transpose (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x += compptr->h_samp_factor) { src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x + x_crop_blocks, - (JDIMENSION) compptr->h_samp_factor, FALSE); + (JDIMENSION) compptr->h_samp_factor, false); for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; src_ptr = src_buffer[offset_x][dst_blk_y + offset_y + y_crop_blocks]; @@ -414,7 +414,7 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x += compptr->h_samp_factor) { @@ -424,13 +424,13 @@ do_rot_90 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, ((j_common_ptr) srcinfo, src_coef_arrays[ci], comp_width - x_crop_blocks - dst_blk_x - (JDIMENSION) compptr->h_samp_factor, - (JDIMENSION) compptr->h_samp_factor, FALSE); + (JDIMENSION) compptr->h_samp_factor, false); } else { /* Edge blocks are transposed but not mirrored. */ src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x + x_crop_blocks, - (JDIMENSION) compptr->h_samp_factor, FALSE); + (JDIMENSION) compptr->h_samp_factor, false); } for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; @@ -495,14 +495,14 @@ do_rot_270 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x += compptr->h_samp_factor) { src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x + x_crop_blocks, - (JDIMENSION) compptr->h_samp_factor, FALSE); + (JDIMENSION) compptr->h_samp_factor, false); for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; if (y_crop_blocks + dst_blk_y < comp_height) { @@ -566,20 +566,20 @@ do_rot_180 (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); if (y_crop_blocks + dst_blk_y < comp_height) { /* Row is within the vertically mirrorable area. */ src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], comp_height - y_crop_blocks - dst_blk_y - (JDIMENSION) compptr->v_samp_factor, - (JDIMENSION) compptr->v_samp_factor, FALSE); + (JDIMENSION) compptr->v_samp_factor, false); } else { /* Bottom-edge rows are only mirrored horizontally. */ src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_y + y_crop_blocks, - (JDIMENSION) compptr->v_samp_factor, FALSE); + (JDIMENSION) compptr->v_samp_factor, false); } for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { dst_row_ptr = dst_buffer[offset_y]; @@ -677,7 +677,7 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, dst_blk_y += compptr->v_samp_factor) { dst_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, dst_coef_arrays[ci], dst_blk_y, - (JDIMENSION) compptr->v_samp_factor, TRUE); + (JDIMENSION) compptr->v_samp_factor, true); for (offset_y = 0; offset_y < compptr->v_samp_factor; offset_y++) { for (dst_blk_x = 0; dst_blk_x < compptr->width_in_blocks; dst_blk_x += compptr->h_samp_factor) { @@ -687,12 +687,12 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, ((j_common_ptr) srcinfo, src_coef_arrays[ci], comp_width - x_crop_blocks - dst_blk_x - (JDIMENSION) compptr->h_samp_factor, - (JDIMENSION) compptr->h_samp_factor, FALSE); + (JDIMENSION) compptr->h_samp_factor, false); } else { src_buffer = (*srcinfo->mem->access_virt_barray) ((j_common_ptr) srcinfo, src_coef_arrays[ci], dst_blk_x + x_crop_blocks, - (JDIMENSION) compptr->h_samp_factor, FALSE); + (JDIMENSION) compptr->h_samp_factor, false); } for (offset_x = 0; offset_x < compptr->h_samp_factor; offset_x++) { dst_ptr = dst_buffer[offset_y][dst_blk_x + offset_x]; @@ -756,7 +756,7 @@ do_transverse (j_decompress_ptr srcinfo, j_compress_ptr dstinfo, /* Parse an unsigned integer: subroutine for jtransform_parse_crop_spec. - * Returns TRUE if valid integer found, FALSE if not. + * Returns true if valid integer found, false if not. * *strptr is advanced over the digit string, and *result is set to its value. */ @@ -771,14 +771,14 @@ jt_read_integer (const char ** strptr, JDIMENSION * result) } *result = val; if (ptr == *strptr) - return FALSE; /* oops, no digits */ + return false; /* oops, no digits */ *strptr = ptr; - return TRUE; + return true; } /* Parse a crop specification (written in X11 geometry style). - * The routine returns TRUE if the spec string is valid, FALSE if not. + * The routine returns true if the spec string is valid, false if not. * * The crop spec string should have the format * <width>x<height>{+-}<xoffset>{+-}<yoffset> @@ -793,7 +793,7 @@ jt_read_integer (const char ** strptr, JDIMENSION * result) GLOBAL(boolean) jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec) { - info->crop = FALSE; + info->crop = false; info->crop_width_set = JCROP_UNSET; info->crop_height_set = JCROP_UNSET; info->crop_xoffset_set = JCROP_UNSET; @@ -802,14 +802,14 @@ jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec) if (isdigit(*spec)) { /* fetch width */ if (! jt_read_integer(&spec, &info->crop_width)) - return FALSE; + return false; info->crop_width_set = JCROP_POS; } if (*spec == 'x' || *spec == 'X') { /* fetch height */ spec++; if (! jt_read_integer(&spec, &info->crop_height)) - return FALSE; + return false; info->crop_height_set = JCROP_POS; } if (*spec == '+' || *spec == '-') { @@ -817,20 +817,20 @@ jtransform_parse_crop_spec (jpeg_transform_info *info, const char *spec) info->crop_xoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS; spec++; if (! jt_read_integer(&spec, &info->crop_xoffset)) - return FALSE; + return false; } if (*spec == '+' || *spec == '-') { /* fetch yoffset */ info->crop_yoffset_set = (*spec == '-') ? JCROP_NEG : JCROP_POS; spec++; if (! jt_read_integer(&spec, &info->crop_yoffset)) - return FALSE; + return false; } /* We had better have gotten to the end of the string. */ if (*spec != '\0') - return FALSE; - info->crop = TRUE; - return TRUE; + return false; + info->crop = true; + return true; } @@ -872,8 +872,8 @@ trim_bottom_edge (jpeg_transform_info *info, JDIMENSION full_height) * the image dimensions) and before jpeg_read_coefficients (which realizes * the source's virtual arrays). * - * This function returns FALSE right away if -perfect is given - * and transformation is not perfect. Otherwise returns TRUE. + * This function returns false right away if -perfect is given + * and transformation is not perfect. Otherwise returns true. */ GLOBAL(boolean) @@ -910,14 +910,14 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, srcinfo->min_DCT_h_scaled_size, srcinfo->min_DCT_v_scaled_size, info->transform)) - return FALSE; + return false; } else { if (!jtransform_perfect_transform(srcinfo->output_width, srcinfo->output_height, srcinfo->max_h_samp_factor * srcinfo->min_DCT_h_scaled_size, srcinfo->max_v_samp_factor * srcinfo->min_DCT_v_scaled_size, info->transform)) - return FALSE; + return false; } } @@ -1005,32 +1005,32 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, /* Figure out whether we need workspace arrays, * and if so whether they are transposed relative to the source. */ - need_workspace = FALSE; - transpose_it = FALSE; + need_workspace = false; + transpose_it = false; switch (info->transform) { case JXFORM_NONE: if (info->x_crop_offset != 0 || info->y_crop_offset != 0) - need_workspace = TRUE; + need_workspace = true; /* No workspace needed if neither cropping nor transforming */ break; case JXFORM_FLIP_H: if (info->trim) trim_right_edge(info, srcinfo->output_width); if (info->y_crop_offset != 0) - need_workspace = TRUE; + need_workspace = true; /* do_flip_h_no_crop doesn't need a workspace array */ break; case JXFORM_FLIP_V: if (info->trim) trim_bottom_edge(info, srcinfo->output_height); /* Need workspace arrays having same dimensions as source image. */ - need_workspace = TRUE; + need_workspace = true; break; case JXFORM_TRANSPOSE: /* transpose does NOT have to trim anything */ /* Need workspace arrays having transposed dimensions. */ - need_workspace = TRUE; - transpose_it = TRUE; + need_workspace = true; + transpose_it = true; break; case JXFORM_TRANSVERSE: if (info->trim) { @@ -1038,15 +1038,15 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, trim_bottom_edge(info, srcinfo->output_width); } /* Need workspace arrays having transposed dimensions. */ - need_workspace = TRUE; - transpose_it = TRUE; + need_workspace = true; + transpose_it = true; break; case JXFORM_ROT_90: if (info->trim) trim_right_edge(info, srcinfo->output_height); /* Need workspace arrays having transposed dimensions. */ - need_workspace = TRUE; - transpose_it = TRUE; + need_workspace = true; + transpose_it = true; break; case JXFORM_ROT_180: if (info->trim) { @@ -1054,14 +1054,14 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, trim_bottom_edge(info, srcinfo->output_height); } /* Need workspace arrays having same dimensions as source image. */ - need_workspace = TRUE; + need_workspace = true; break; case JXFORM_ROT_270: if (info->trim) trim_bottom_edge(info, srcinfo->output_width); /* Need workspace arrays having transposed dimensions. */ - need_workspace = TRUE; - transpose_it = TRUE; + need_workspace = true; + transpose_it = true; break; } @@ -1094,14 +1094,14 @@ jtransform_request_workspace (j_decompress_ptr srcinfo, width_in_blocks = width_in_iMCUs * h_samp_factor; height_in_blocks = height_in_iMCUs * v_samp_factor; coef_arrays[ci] = (*srcinfo->mem->request_virt_barray) - ((j_common_ptr) srcinfo, JPOOL_IMAGE, FALSE, + ((j_common_ptr) srcinfo, JPOOL_IMAGE, false, width_in_blocks, height_in_blocks, (JDIMENSION) v_samp_factor); } info->workspace_coef_arrays = coef_arrays; } else info->workspace_coef_arrays = NULL; - return TRUE; + return true; } @@ -1166,9 +1166,9 @@ adjust_exif_parameters (JOCTET FAR * data, unsigned int length, /* Discover byte order */ if (GETJOCTET(data[0]) == 0x49 && GETJOCTET(data[1]) == 0x49) - is_motorola = FALSE; + is_motorola = false; else if (GETJOCTET(data[0]) == 0x4D && GETJOCTET(data[1]) == 0x4D) - is_motorola = TRUE; + is_motorola = true; else return; @@ -1384,7 +1384,7 @@ jtransform_adjust_parameters (j_decompress_ptr srcinfo, GETJOCTET(srcinfo->marker_list->data[4]) == 0 && GETJOCTET(srcinfo->marker_list->data[5]) == 0) { /* Suppress output of JFIF marker */ - dstinfo->write_JFIF_header = FALSE; + dstinfo->write_JFIF_header = false; /* Adjust Exif image parameters */ if (dstinfo->jpeg_width != srcinfo->image_width || dstinfo->jpeg_height != srcinfo->image_height) @@ -1478,8 +1478,8 @@ jtransform_execute_transform (j_decompress_ptr srcinfo, * MCU_width = cinfo.max_h_samp_factor * cinfo.block_size * MCU_height = cinfo.max_v_samp_factor * cinfo.block_size * Result: - * TRUE = perfect transformation possible - * FALSE = perfect transformation not possible + * true = perfect transformation possible + * false = perfect transformation not possible * (may use custom action then) */ @@ -1488,25 +1488,25 @@ jtransform_perfect_transform(JDIMENSION image_width, JDIMENSION image_height, int MCU_width, int MCU_height, JXFORM_CODE transform) { - boolean result = TRUE; /* initialize TRUE */ + boolean result = true; /* initialize true */ switch (transform) { case JXFORM_FLIP_H: case JXFORM_ROT_270: if (image_width % (JDIMENSION) MCU_width) - result = FALSE; + result = false; break; case JXFORM_FLIP_V: case JXFORM_ROT_90: if (image_height % (JDIMENSION) MCU_height) - result = FALSE; + result = false; break; case JXFORM_TRANSVERSE: case JXFORM_ROT_180: if (image_width % (JDIMENSION) MCU_width) - result = FALSE; + result = false; if (image_height % (JDIMENSION) MCU_height) - result = FALSE; + result = false; break; default: break; diff --git a/src/libs/jpegutils/transupp.h b/src/libs/jpegutils/transupp.h index 7dd3fad6..3ecfda1f 100644 --- a/src/libs/jpegutils/transupp.h +++ b/src/libs/jpegutils/transupp.h @@ -132,12 +132,12 @@ typedef enum { typedef struct { /* Options: set by caller */ JXFORM_CODE transform; /* image transform operator */ - boolean perfect; /* if TRUE, fail if partial MCUs are requested */ - boolean trim; /* if TRUE, trim partial MCUs as needed */ - boolean force_grayscale; /* if TRUE, convert color image to grayscale */ - boolean crop; /* if TRUE, crop source image */ + boolean perfect; /* if true, fail if partial MCUs are requested */ + boolean trim; /* if true, trim partial MCUs as needed */ + boolean force_grayscale; /* if true, convert color image to grayscale */ + boolean crop; /* if true, crop source image */ - /* Crop parameters: application need not set these unless crop is TRUE. + /* Crop parameters: application need not set these unless crop is true. * These can be filled in by jtransform_parse_crop_spec(). */ JDIMENSION crop_width; /* Width of selected region */ @@ -318,8 +318,8 @@ typedef enum { typedef struct { /* Options: set by caller */ JXFORM_CODE transform; /* image transform operator */ - boolean trim; /* if TRUE, trim partial MCUs as needed */ - boolean force_grayscale; /* if TRUE, convert color image to grayscale */ + boolean trim; /* if true, trim partial MCUs as needed */ + boolean force_grayscale; /* if true, convert color image to grayscale */ /* Internal workspace: caller should not touch these */ int num_components; /* # of components in workspace */ diff --git a/src/libs/lprof/cmshull.cpp b/src/libs/lprof/cmshull.cpp index 05b8dfa3..fd82beea 100644 --- a/src/libs/lprof/cmshull.cpp +++ b/src/libs/lprof/cmshull.cpp @@ -41,10 +41,10 @@ LCMSHANDLE cdecl cmsxHullInit(void); void cdecl cmsxHullDone(LCMSHANDLE hHull); -BOOL cdecl cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z); -BOOL cdecl cmsxHullComputeHull(LCMSHANDLE hHull); +bool cdecl cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z); +bool cdecl cmsxHullComputeHull(LCMSHANDLE hHull); char cdecl cmsxHullCheckpoint(LCMSHANDLE hHull, int x, int y, int z); -BOOL cdecl cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname); +bool cdecl cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname); /* --------------------------------------------------------------------- */ @@ -102,7 +102,7 @@ struct _edge_struct { LPFACE AdjFace[2]; LPVERTEX EndPts[2]; LPFACE NewFace; /* pointer to incident cone face. */ - BOOL DoDelete; /* T iff Edge should be delete. */ + bool DoDelete; /* T iff Edge should be delete. */ LPEDGE Next, Prev; }; @@ -111,7 +111,7 @@ struct _face_struct { LPEDGE Edge[3]; LPVERTEX Vertex[3]; - BOOL Visible; /* T iff face Visible from new point. */ + bool Visible; /* T iff face Visible from new point. */ LPFACE Next, Prev; }; @@ -121,8 +121,8 @@ struct _vertex_struct { int v[3]; int vnum; LPEDGE duplicate; /* pointer to incident cone Edge (or NULL) */ - BOOL onhull; /* T iff point on hull. */ - BOOL mark; /* T iff point already processed. */ + bool onhull; /* T iff point on hull. */ + bool mark; /* T iff point already processed. */ LPVERTEX Next, Prev; }; @@ -271,7 +271,7 @@ Collinear checks to see if the three points given are collinear, by checking to see if each element of the cross product is zero. ---------------------------------------------------------------------*/ static -BOOL Collinear( LPVERTEX a, LPVERTEX b, LPVERTEX c ) +bool Collinear( LPVERTEX a, LPVERTEX b, LPVERTEX c ) { return ( c->v[Z] - a->v[Z] ) * ( b->v[Y] - a->v[Y] ) - @@ -565,12 +565,12 @@ are Visible, then the Edge is marked for deletion. If just one of the adjacent faces is Visible then a new face is constructed. ---------------------------------------------------------------------*/ static -BOOL AddOne(LPHULL hull, LPVERTEX p) +bool AddOne(LPHULL hull, LPVERTEX p) { LPFACE f; LPEDGE e, temp; int vol; - BOOL vis = false; + bool vis = false; /* Mark faces Visible from p. */ @@ -634,7 +634,7 @@ BOOL AddOne(LPHULL hull, LPVERTEX p) ---------------------------------------------------------------------*/ static -BOOL DoubleTriangle(LPHULL hull) +bool DoubleTriangle(LPHULL hull) { LPVERTEX v0, v1, v2, v3; LPFACE f0, f1 = NULL; @@ -693,7 +693,7 @@ static void ConstructHull(LPHULL hull) { LPVERTEX v, vnext; - BOOL changed; /* T if addition changes hull; not used. */ + bool changed; /* T if addition changes hull; not used. */ v = hull->vertices; @@ -1308,7 +1308,7 @@ void cmsxHullDone(LCMSHANDLE hHull) } -BOOL cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z) +bool cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z) { LPVERTEX v; LPHULL hull = (LPHULL) (LPSTR) hHull; @@ -1323,7 +1323,7 @@ BOOL cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z) return true; } -BOOL cmsxHullComputeHull(LCMSHANDLE hHull) +bool cmsxHullComputeHull(LCMSHANDLE hHull) { LPHULL hull = (LPHULL) (LPSTR) hHull; @@ -1348,7 +1348,7 @@ char cmsxHullCheckpoint(LCMSHANDLE hHull, int x, int y, int z) } -BOOL cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) +bool cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname) { FILE* fp; int i; diff --git a/src/libs/lprof/cmslm.cpp b/src/libs/lprof/cmslm.cpp index 81d86ba6..9afb8c00 100644 --- a/src/libs/lprof/cmslm.cpp +++ b/src/libs/lprof/cmslm.cpp @@ -69,8 +69,8 @@ LCMSHANDLE cdecl cmsxLevenbergMarquardtInit(LPSAMPLEDCURVE x, LPSAMPLEDCURVE y, double cdecl cmsxLevenbergMarquardtAlamda(LCMSHANDLE hMRQ); double cdecl cmsxLevenbergMarquardtChiSq(LCMSHANDLE hMRQ); -BOOL cdecl cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ); -BOOL cdecl cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ); +bool cdecl cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ); +bool cdecl cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ); /* ---------------------------------------------------------------------------- */ @@ -212,7 +212,7 @@ failed: } -BOOL cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ) +bool cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ) { LPLMRTQMIN pLM = (LPLMRTQMIN)hMRQ; if(!pLM) @@ -223,10 +223,10 @@ BOOL cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ) } -BOOL cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ) +bool cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ) { int j, k; - BOOL sts; + bool sts; LPLMRTQMIN pLM = (LPLMRTQMIN)hMRQ; if(!pLM) return false; diff --git a/src/libs/lprof/cmslnr.cpp b/src/libs/lprof/cmslnr.cpp index dddd8e38..aacfc494 100644 --- a/src/libs/lprof/cmslnr.cpp +++ b/src/libs/lprof/cmslnr.cpp @@ -107,7 +107,7 @@ void cdecl cmsxApplyLinearizationGamma(WORD In[3], LPGAMMATABLE Gamma[3], WORD O static -LPSAMPLEDCURVE NormalizeTo(LPSAMPLEDCURVE X, double N, BOOL lAddEndPoint) +LPSAMPLEDCURVE NormalizeTo(LPSAMPLEDCURVE X, double N, bool lAddEndPoint) { int i, nItems; LPSAMPLEDCURVE XNorm; @@ -186,12 +186,12 @@ void GammaGainOffsetFn(double x, double *a, double *y, double *dyda, int na) /* Fit curve to our gamma-gain-offset model. */ static -BOOL OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) +bool OneTry(LPSAMPLEDCURVE XNorm, LPSAMPLEDCURVE YNorm, double a[]) { LCMSHANDLE h; double ChiSq, OldChiSq; int i; - BOOL Status = true; + bool Status = true; /* initial guesses */ @@ -280,7 +280,7 @@ void Bubble(LPSAMPLEDCURVE C, LPSAMPLEDCURVE L) { #define SWAP(a, b) { tmp = (a); (a) = (b); (b) = tmp; } - BOOL lSwapped; + bool lSwapped; int i, nItems; double tmp; diff --git a/src/libs/lprof/cmsmatn.cpp b/src/libs/lprof/cmsmatn.cpp index bca52717..bf583db3 100644 --- a/src/libs/lprof/cmsmatn.cpp +++ b/src/libs/lprof/cmsmatn.cpp @@ -44,7 +44,7 @@ LPMATN cdecl MATNmult(LPMATN a1, LPMATN a2); double cdecl MATNcross(LPMATN a); void cdecl MATNscalar (LPMATN a, double scl, LPMATN b); LPMATN cdecl MATNtranspose (LPMATN a); -BOOL cdecl MATNsolve(LPMATN a, LPMATN b); +bool cdecl MATNsolve(LPMATN a, LPMATN b); /* ------------------------------------------------------------ Implementation */ @@ -108,9 +108,9 @@ LPMATN MATNalloc(int Rows, int Cols) /* Gauss-Jordan elimination. There is also a more */ /* exahustive non-singular matrix checking part. */ -BOOL MATNsolve(LPMATN a, LPMATN b) +bool MATNsolve(LPMATN a, LPMATN b) { - BOOL status; + bool status; int n = a->Rows; int i, iCol=0, iRow=0, j, k; double fMax, fAbs, fSave, fInf, temp; diff --git a/src/libs/lprof/cmsmkmsh.cpp b/src/libs/lprof/cmsmkmsh.cpp index c0e3d4c3..c1667067 100644 --- a/src/libs/lprof/cmsmkmsh.cpp +++ b/src/libs/lprof/cmsmkmsh.cpp @@ -38,7 +38,7 @@ #include "lcmsprf.h" -BOOL cdecl cmsxComputeMatrixShaper(const char* ReferenceSheet, +bool cdecl cmsxComputeMatrixShaper(const char* ReferenceSheet, const char* MeasurementSheet, int Medium, LPGAMMATABLE TransferCurves[3], @@ -62,7 +62,7 @@ void Div100(LPcmsCIEXYZ xyz) /* Compute endpoints */ static -BOOL ComputeWhiteAndBlackPoints(LPMEASUREMENT Linearized, +bool ComputeWhiteAndBlackPoints(LPMEASUREMENT Linearized, LPGAMMATABLE TransferCurves[3], LPcmsCIEXYZ Black, LPcmsCIEXYZ White) { @@ -108,7 +108,7 @@ BOOL ComputeWhiteAndBlackPoints(LPMEASUREMENT Linearized, /* Study convergence of primary axis */ static -BOOL ComputePrimary(LPMEASUREMENT Linearized, +bool ComputePrimary(LPMEASUREMENT Linearized, LPGAMMATABLE TransferCurves[3], int n, LPcmsCIExyY Primary) @@ -157,7 +157,7 @@ double Clip(double d) } -BOOL cmsxComputeMatrixShaper(const char* ReferenceSheet, +bool cmsxComputeMatrixShaper(const char* ReferenceSheet, const char* MeasurementSheet, int Medium, LPGAMMATABLE TransferCurves[3], diff --git a/src/libs/lprof/cmsmntr.cpp b/src/libs/lprof/cmsmntr.cpp index ed14ed50..a9e93d54 100644 --- a/src/libs/lprof/cmsmntr.cpp +++ b/src/libs/lprof/cmsmntr.cpp @@ -140,7 +140,7 @@ int RegressionSamplerB2A(WORD In[], WORD Out[], LPVOID Cargo) } -BOOL cmsxMonitorProfilerInit(LPMONITORPROFILERDATA sys) +bool cmsxMonitorProfilerInit(LPMONITORPROFILERDATA sys) { @@ -197,7 +197,7 @@ void CreatePrimaryMatrices(LPMONITORPROFILERDATA sys) static -BOOL CreateLUTS(LPMONITORPROFILERDATA sys, LPLUT* A2B, LPLUT* B2A) +bool CreateLUTS(LPMONITORPROFILERDATA sys, LPLUT* A2B, LPLUT* B2A) { LPLUT AToB0 = cmsAllocLUT(); LPLUT BToA0 = cmsAllocLUT(); @@ -274,7 +274,7 @@ BOOL CreateLUTS(LPMONITORPROFILERDATA sys, LPLUT* A2B, LPLUT* B2A) -BOOL cmsxMonitorProfilerDo(LPMONITORPROFILERDATA sys) +bool cmsxMonitorProfilerDo(LPMONITORPROFILERDATA sys) { cmsCIExyY White; diff --git a/src/libs/lprof/cmsoutl.cpp b/src/libs/lprof/cmsoutl.cpp index 248aaa04..40e3ce54 100644 --- a/src/libs/lprof/cmsoutl.cpp +++ b/src/libs/lprof/cmsoutl.cpp @@ -41,10 +41,10 @@ /* Res points to a result in XYZ or Lab */ -BOOL cdecl cmsxRegressionInterpolatorRGB(LPMEASUREMENT m, +bool cdecl cmsxRegressionInterpolatorRGB(LPMEASUREMENT m, int ColorSpace, int RegressionTerms, - BOOL lUseLocalPatches, + bool lUseLocalPatches, int MinPatchesToCollect, double r, double g, double b, void* Res); @@ -60,7 +60,7 @@ void EstimateRegression(LPMEASUREMENT m, double r, double g, double b, int ColorSpace, LPMATN* ptfm, int nterms, - BOOL lIncludeAllPatches, + bool lIncludeAllPatches, int MinPatchesToCollect) { int nCollected; @@ -68,11 +68,11 @@ void EstimateRegression(LPMEASUREMENT m, double r, double g, double b, int ToCollect; SETOFPATCHES collected = cmsxPCollBuildSet(m, false); SETOFPATCHES allowed = cmsxPCollBuildSet(m, true); - BOOL rc; - BOOL lPatchesExhausted = false; + bool rc; + bool lPatchesExhausted = false; - CopyMemory(allowed, m -> Allowed, m->nPatches*sizeof(BOOL)); + CopyMemory(allowed, m -> Allowed, m->nPatches*sizeof(bool)); *ptfm = NULL; @@ -82,7 +82,7 @@ void EstimateRegression(LPMEASUREMENT m, double r, double g, double b, if (lIncludeAllPatches) { - CopyMemory(collected, allowed, m->nPatches*sizeof(BOOL)); + CopyMemory(collected, allowed, m->nPatches*sizeof(bool)); lPatchesExhausted = true; ToCollect = nCollected = m->nPatches; } @@ -124,10 +124,10 @@ void EstimateRegression(LPMEASUREMENT m, double r, double g, double b, -BOOL cmsxRegressionInterpolatorRGB(LPMEASUREMENT m, +bool cmsxRegressionInterpolatorRGB(LPMEASUREMENT m, int ColorSpace, int RegressionTerms, - BOOL lUseLocalPatches, + bool lUseLocalPatches, int MinPatchesToCollect, double r, double g, double b, void* Res) @@ -241,14 +241,14 @@ void CheckOneRegressionMatrix(LPPROFILERCOMMONDATA hdr, LPMATN Matrix, /* Trial-and-error in order to get best number of terms. */ -int cmsxFindOptimumNumOfTerms(LPPROFILERCOMMONDATA hdr, int nMaxTerms, BOOL* lAllOk) +int cmsxFindOptimumNumOfTerms(LPPROFILERCOMMONDATA hdr, int nMaxTerms, bool* lAllOk) { int i, BestTerms; - BOOL rc; + bool rc; LPMATN Matrix = NULL; MLRSTATISTICS Stat; double dEmean, dEStd, dEHit, Best; - BOOL lOneFound; + bool lOneFound; BestTerms = 4; diff --git a/src/libs/lprof/cmspcoll.cpp b/src/libs/lprof/cmspcoll.cpp index 0b03fd5a..30a2c0c0 100644 --- a/src/libs/lprof/cmspcoll.cpp +++ b/src/libs/lprof/cmspcoll.cpp @@ -40,9 +40,9 @@ /* ----------------------------------------------------------------- Patch collections */ -BOOL cdecl cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet); +bool cdecl cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet); -BOOL cdecl cmsxPCollBuildMeasurement(LPMEASUREMENT m, +bool cdecl cmsxPCollBuildMeasurement(LPMEASUREMENT m, const char *ReferenceSheet, const char *MeasurementSheet, DWORD dwNeededSamplesType); @@ -57,9 +57,9 @@ LPPATCH cdecl cmsxPCollAddPatchRGB(LPMEASUREMENT m, const char *Name, /* Sets of patches */ -SETOFPATCHES cdecl cmsxPCollBuildSet(LPMEASUREMENT m, BOOL lDefault); +SETOFPATCHES cdecl cmsxPCollBuildSet(LPMEASUREMENT m, bool lDefault); int cdecl cmsxPCollCountSet(LPMEASUREMENT m, SETOFPATCHES Set); -BOOL cdecl cmsxPCollValidatePatches(LPMEASUREMENT m, DWORD dwFlags); +bool cdecl cmsxPCollValidatePatches(LPMEASUREMENT m, DWORD dwFlags); /* Collect "need" patches of the specific kind, return the number of collected (that */ @@ -95,7 +95,7 @@ LPPATCH cdecl cmsxPCollFindPrimary(LPMEASUREMENT m, SETOFPATCHES Valids, in /* A wrapper on stricmp() */ static -BOOL EqualsTo(const char* a, const char *b) +bool EqualsTo(const char* a, const char *b) { return (stricmp(a, b) == 0); } @@ -216,7 +216,7 @@ void NormalizeColorant(LPMEASUREMENT m) /* Load a collection from a Sheet */ -BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) +bool cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) { int i; DWORD dwMask; @@ -300,7 +300,7 @@ BOOL cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet) /* Does save parameters to a empty sheet */ -BOOL cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8) +bool cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8) { int nNumberOfSets = cmsxPCollCountSet(m, m->Allowed); int nNumberOfFields = 0; @@ -437,13 +437,13 @@ void FixLabOnly(LPMEASUREMENT m) /* See lprof.h for further info */ -BOOL cmsxPCollBuildMeasurement(LPMEASUREMENT m, +bool cmsxPCollBuildMeasurement(LPMEASUREMENT m, const char *ReferenceSheet, const char *MeasurementSheet, DWORD dwNeededSamplesType) { LCMSHANDLE hSheet; - BOOL rc = true; + bool rc = true; ZeroMemory(m, sizeof(MEASUREMENT)); @@ -521,9 +521,9 @@ LPPATCH cmsxPCollGetPatchByName(LPMEASUREMENT m, const char* name, int* lpPos) /* -------------------------------------------------------------------- Sets */ -SETOFPATCHES cmsxPCollBuildSet(LPMEASUREMENT m, BOOL lDefault) +SETOFPATCHES cmsxPCollBuildSet(LPMEASUREMENT m, bool lDefault) { - SETOFPATCHES Full = (SETOFPATCHES) malloc(m -> nPatches * sizeof(BOOL)); + SETOFPATCHES Full = (SETOFPATCHES) malloc(m -> nPatches * sizeof(bool)); int i; for (i=0; i < m -> nPatches; i++) @@ -548,7 +548,7 @@ int cmsxPCollCountSet(LPMEASUREMENT m, SETOFPATCHES Set) /* Validate patches */ -BOOL cmsxPCollValidatePatches(LPMEASUREMENT m, DWORD dwFlags) +bool cmsxPCollValidatePatches(LPMEASUREMENT m, DWORD dwFlags) { int i, n; diff --git a/src/libs/lprof/cmsprf.cpp b/src/libs/lprof/cmsprf.cpp index 527fc8e8..3baa92ca 100644 --- a/src/libs/lprof/cmsprf.cpp +++ b/src/libs/lprof/cmsprf.cpp @@ -38,9 +38,9 @@ double cdecl _cmsxSaturate255To65535(double d); void cdecl _cmsxClampXYZ100(LPcmsCIEXYZ xyz); -BOOL cdecl cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr); -BOOL cdecl cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr); -BOOL cdecl cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr); /* ----------------------------------------------------------------- Implementation */ @@ -115,13 +115,13 @@ int xfilelength(int fd) } -BOOL cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr) +bool cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr) { LCMSHANDLE it8 = cmsxIT8Alloc(); LPBYTE mem; size_t size, readed; FILE* f; - BOOL lFreeOnExit = false; + bool lFreeOnExit = false; if (!hdr->m.Patches) { @@ -167,7 +167,7 @@ BOOL cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr) static -BOOL ComputeColorantMatrix(LPcmsCIEXYZTRIPLE Colorants, +bool ComputeColorantMatrix(LPcmsCIEXYZTRIPLE Colorants, LPcmsCIExyY WhitePoint, LPcmsCIExyYTRIPLE Primaries) { @@ -198,7 +198,7 @@ BOOL ComputeColorantMatrix(LPcmsCIEXYZTRIPLE Colorants, } -BOOL cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr) +bool cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr) { cmsCIEXYZTRIPLE Colorant; cmsCIExyY MediaWhite; @@ -220,7 +220,7 @@ BOOL cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr) } -BOOL cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr) +bool cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr) { if (*hdr ->Description) cmsAddTag(hdr ->hProfile, icSigProfileDescriptionTag, hdr ->Description); @@ -239,7 +239,7 @@ BOOL cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr) -void cmsxChromaticAdaptationAndNormalization(LPPROFILERCOMMONDATA hdr, LPcmsCIEXYZ xyz, BOOL lReverse) +void cmsxChromaticAdaptationAndNormalization(LPPROFILERCOMMONDATA hdr, LPcmsCIEXYZ xyz, bool lReverse) { if (hdr->lUseCIECAM97s) { @@ -369,7 +369,7 @@ void cmsxComputeGamutHull(LPPROFILERCOMMONDATA hdr) } -BOOL cmsxChoosePCS(LPPROFILERCOMMONDATA hdr) +bool cmsxChoosePCS(LPPROFILERCOMMONDATA hdr) { double gamma_r, gamma_g, gamma_b; diff --git a/src/libs/lprof/cmsreg.cpp b/src/libs/lprof/cmsreg.cpp index 4e66a9ef..621746c0 100644 --- a/src/libs/lprof/cmsreg.cpp +++ b/src/libs/lprof/cmsreg.cpp @@ -79,10 +79,10 @@ int cdecl cmsxRegressionCreateMatrix(LPMEASUREMENT m, SETOFPATCHES Allowed, int int ColorSpace, LPMATN* lpMat, LPMLRSTATISTICS Stat); -BOOL cdecl cmsxRegressionRGB2Lab(double r, double g, double b, +bool cdecl cmsxRegressionRGB2Lab(double r, double g, double b, LPMATN tfm, LPcmsCIELab Lab); -BOOL cdecl cmsxRegressionRGB2XYZ(double r, double g, double b, +bool cdecl cmsxRegressionRGB2XYZ(double r, double g, double b, LPMATN tfm, LPcmsCIEXYZ XYZ); @@ -95,7 +95,7 @@ BOOL cdecl cmsxRegressionRGB2XYZ(double r, double g, double b, /* Returns false if something goes wrong, or true if all Ok. */ static -BOOL MultipleLinearRegression(const LPMATN xi, /* Dependent variable */ +bool MultipleLinearRegression(const LPMATN xi, /* Dependent variable */ const LPMATN y, /* Independent variable */ int nvar, /* Number of samples */ int npar, /* Number of parameters (terms) */ @@ -217,7 +217,7 @@ BOOL MultipleLinearRegression(const LPMATN xi, /* Dependent varia /* keeping track of error as well. */ static -BOOL CreateRegressionMatrix(const LPMATN Input, const LPMATN Output, +bool CreateRegressionMatrix(const LPMATN Input, const LPMATN Output, LPMATN* ptrMatrix, LPMLRSTATISTICS maxErrorMeas) { double* coef; @@ -463,7 +463,7 @@ int cmsxRegressionCreateMatrix(LPMEASUREMENT m, SETOFPATCHES Allowed, int nterms /* Convert a RGB triplet to Lab by using regression matrix */ -BOOL cmsxRegressionRGB2Lab(double r, double g, double b, LPMATN tfm, LPcmsCIELab Lab) +bool cmsxRegressionRGB2Lab(double r, double g, double b, LPMATN tfm, LPcmsCIELab Lab) { LPMATN inVec, outVec; int i; @@ -495,7 +495,7 @@ BOOL cmsxRegressionRGB2Lab(double r, double g, double b, LPMATN tfm, LPcmsCIELab /* Convert a RGB triplet to XYX by using regression matrix */ -BOOL cmsxRegressionRGB2XYZ(double r, double g, double b, LPMATN tfm, LPcmsCIEXYZ XYZ) +bool cmsxRegressionRGB2XYZ(double r, double g, double b, LPMATN tfm, LPcmsCIEXYZ XYZ) { LPMATN inVec, outVec; int i; @@ -527,7 +527,7 @@ BOOL cmsxRegressionRGB2XYZ(double r, double g, double b, LPMATN tfm, LPcmsCIEXYZ /* Convert a RGB triplet to XYX by using regression matrix */ -BOOL cmsxRegressionXYZ2RGB(LPcmsCIEXYZ XYZ, LPMATN tfm, double RGB[3]) +bool cmsxRegressionXYZ2RGB(LPcmsCIEXYZ XYZ, LPMATN tfm, double RGB[3]) { LPMATN inVec, outVec; int i; diff --git a/src/libs/lprof/cmsscn.cpp b/src/libs/lprof/cmsscn.cpp index b99fed87..dec58126 100644 --- a/src/libs/lprof/cmsscn.cpp +++ b/src/libs/lprof/cmsscn.cpp @@ -41,8 +41,8 @@ /* The scanner profiler */ -BOOL cdecl cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys); -BOOL cdecl cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys); +bool cdecl cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys); +bool cdecl cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys); /* ------------------------------------------------------------ Implementation */ @@ -53,7 +53,7 @@ BOOL cdecl cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys); static void ComputeGlobalRegression(LPSCANNERPROFILERDATA sys) { - BOOL lAllOk; + bool lAllOk; int nTerms; MLRSTATISTICS Stat; @@ -92,7 +92,7 @@ void ComputeGlobalRegression(LPSCANNERPROFILERDATA sys) /* Fill struct with default values */ -BOOL cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys) +bool cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys) { @@ -286,7 +286,7 @@ int RegressionSamplerXYZ(WORD In[], WORD Out[], LPVOID Cargo) /* The main scanner profiler */ -BOOL cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys) +bool cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys) { LPLUT AToB0; diff --git a/src/libs/lprof/cmssheet.cpp b/src/libs/lprof/cmssheet.cpp index cf8c569e..1c6327b7 100644 --- a/src/libs/lprof/cmssheet.cpp +++ b/src/libs/lprof/cmssheet.cpp @@ -48,14 +48,14 @@ void cdecl cmsxIT8Free(LCMSHANDLE IT8); /* Persistence */ LCMSHANDLE cdecl cmsxIT8LoadFromFile(const char* cFileName); LCMSHANDLE cdecl cmsxIT8LoadFromMem(void *Ptr, size_t len); -BOOL cdecl cmsxIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName); +bool cdecl cmsxIT8SaveToFile(LCMSHANDLE IT8, const char* cFileName); /* Properties */ const char* cdecl cmsxIT8GetSheetType(LCMSHANDLE hIT8); -BOOL cdecl cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); +bool cdecl cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); -BOOL cdecl cmsxIT8SetProperty(LCMSHANDLE hIT8, const char* cProp, const char *Str); -BOOL cdecl cmsxIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val); +bool cdecl cmsxIT8SetProperty(LCMSHANDLE hIT8, const char* cProp, const char *Str); +bool cdecl cmsxIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val); const char* cdecl cmsxIT8GetProperty(LCMSHANDLE hIT8, const char* cProp); double cdecl cmsxIT8GetPropertyDbl(LCMSHANDLE hIT8, const char* cProp); @@ -64,20 +64,20 @@ int cdecl cmsxIT8EnumProperties(LCMSHANDLE IT8, char ***PropertyNames); /* Datasets */ -BOOL cdecl cmsxIT8GetDataSetByPos(LCMSHANDLE IT8, int col, int row, char* Val, int ValBufferLen); +bool cdecl cmsxIT8GetDataSetByPos(LCMSHANDLE IT8, int col, int row, char* Val, int ValBufferLen); -BOOL cdecl cmsxIT8GetDataSet(LCMSHANDLE IT8, const char* cPatch, +bool cdecl cmsxIT8GetDataSet(LCMSHANDLE IT8, const char* cPatch, const char* cSample, char* Val, int ValBufferLen); -BOOL cdecl cmsxIT8GetDataSetDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample, double* d); +bool cdecl cmsxIT8GetDataSetDbl(LCMSHANDLE IT8, const char* cPatch, const char* cSample, double* d); -BOOL cdecl cmsxIT8SetDataSet(LCMSHANDLE IT8, const char* cPatch, +bool cdecl cmsxIT8SetDataSet(LCMSHANDLE IT8, const char* cPatch, const char* cSample, char *Val); -BOOL cdecl cmsxIT8SetDataFormat(LCMSHANDLE IT8, int n, const char *Sample); +bool cdecl cmsxIT8SetDataFormat(LCMSHANDLE IT8, int n, const char *Sample); int cdecl cmsxIT8EnumDataFormat(LCMSHANDLE IT8, char ***SampleNames); const char *cdecl cmsxIT8GenericPatchName(int nPatch, char* buffer); @@ -289,7 +289,7 @@ static char* PredefinedSampleID[] = { /* Checks whatsever if c is a valid identifier middle char. */ static -BOOL isidchar(int c) +bool isidchar(int c) { return (isalnum(c) || c == '$' || c == '%' || c == '&' || c == '/' || c == '.' || c == '_'); @@ -297,14 +297,14 @@ BOOL isidchar(int c) /* Checks whatsever if c is a valid identifier first char. */ static -BOOL isfirstidchar(int c) +bool isfirstidchar(int c) { return !isdigit(c) && isidchar(c); } /* Checks if c is a separator */ static -BOOL isseparator(int c) +bool isseparator(int c) { return (c == ' ' || c == '\t' || c == '\r'); } @@ -337,7 +337,7 @@ int xfilelength(int fd) } static -BOOL SynError(LPIT8 it8, const char *Txt, ...) +bool SynError(LPIT8 it8, const char *Txt, ...) { char Buffer[256], ErrMsg[1024]; va_list args; @@ -353,7 +353,7 @@ BOOL SynError(LPIT8 it8, const char *Txt, ...) } static -BOOL Check(LPIT8 it8, SYMBOL sy, const char* Err) +bool Check(LPIT8 it8, SYMBOL sy, const char* Err) { if (it8 -> sy != sy) return SynError(it8, Err); @@ -626,7 +626,7 @@ void InSymbol(LPIT8 it8) /* Checks end of line separator */ static -BOOL CheckEOLN(LPIT8 it8) +bool CheckEOLN(LPIT8 it8) { if (!Check(it8, SEOLN, "Expected separator")) return false; while (it8 -> sy == SEOLN) @@ -646,7 +646,7 @@ void Skip(LPIT8 it8, SYMBOL sy) /* Returns a string holding current value */ static -BOOL GetVal(LPIT8 it8, char* Buffer) +bool GetVal(LPIT8 it8, char* Buffer) { switch (it8->sy) { @@ -738,7 +738,7 @@ char *AllocString(LPIT8 it8, const char* str) /* Searches through linked list */ static -BOOL IsAvailableOnList(LPKEYVALUE p, const char* Key, LPKEYVALUE* LastPtr) +bool IsAvailableOnList(LPKEYVALUE p, const char* Key, LPKEYVALUE* LastPtr) { for (; p != NULL; p = p->Next) { @@ -754,7 +754,7 @@ BOOL IsAvailableOnList(LPKEYVALUE p, const char* Key, LPKEYVALUE* LastPtr) /* Add a property into a linked list */ static -BOOL AddToList(LPIT8 it8, LPKEYVALUE* Head, const char *Key, const char* Value) +bool AddToList(LPIT8 it8, LPKEYVALUE* Head, const char *Key, const char* Value) { LPKEYVALUE p; LPKEYVALUE last; @@ -795,14 +795,14 @@ BOOL AddToList(LPIT8 it8, LPKEYVALUE* Head, const char *Key, const char* Value) } static -BOOL AddAvailableProperty(LPIT8 it8, const char* Key) +bool AddAvailableProperty(LPIT8 it8, const char* Key) { return AddToList(it8, &it8->ValidKeywords, Key, NULL); } static -BOOL AddAvailableSampleID(LPIT8 it8, const char* Key) +bool AddAvailableSampleID(LPIT8 it8, const char* Key) { return AddToList(it8, &it8->ValidSampleID, Key, NULL); } @@ -859,7 +859,7 @@ const char* cdecl cmsxIT8GetSheetType(LCMSHANDLE hIT8) } -BOOL cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type) +bool cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type) { LPIT8 it8 = (LPIT8) hIT8; @@ -870,7 +870,7 @@ BOOL cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type) /* Sets a property */ -BOOL cmsxIT8SetProperty(LCMSHANDLE hIT8, const char* Key, const char *Val) +bool cmsxIT8SetProperty(LCMSHANDLE hIT8, const char* Key, const char *Val) { LPIT8 it8 = (LPIT8) hIT8; @@ -881,7 +881,7 @@ BOOL cmsxIT8SetProperty(LCMSHANDLE hIT8, const char* Key, const char *Val) } -BOOL cmsxIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val) +bool cmsxIT8SetPropertyDbl(LCMSHANDLE hIT8, const char* cProp, double Val) { char Buffer[256]; @@ -944,7 +944,7 @@ const char *GetDataFormat(LPIT8 it8, int n) } static -BOOL SetDataFormat(LPIT8 it8, int n, const char *label) +bool SetDataFormat(LPIT8 it8, int n, const char *label) { if (n > it8 -> nSamples) return false; @@ -960,7 +960,7 @@ BOOL SetDataFormat(LPIT8 it8, int n, const char *label) } -BOOL cmsxIT8SetDataFormat(LCMSHANDLE h, int n, const char *Sample) +bool cmsxIT8SetDataFormat(LCMSHANDLE h, int n, const char *Sample) { LPIT8 it8 = (LPIT8) h; return SetDataFormat(it8, n, Sample); @@ -995,7 +995,7 @@ char* GetData(LPIT8 it8, int nSet, int nField) } static -BOOL SetData(LPIT8 it8, int nSet, int nField, char *Val) +bool SetData(LPIT8 it8, int nSet, int nField, char *Val) { if (!it8->Data) AllocateDataSet(it8); @@ -1114,7 +1114,7 @@ void WriteData(FILE *fp, LPIT8 it8) /* Saves whole file */ -BOOL cmsxIT8SaveToFile(LCMSHANDLE hIT8, const char* cFileName) +bool cmsxIT8SaveToFile(LCMSHANDLE hIT8, const char* cFileName) { FILE *fp; LPIT8 it8 = (LPIT8) hIT8; @@ -1132,7 +1132,7 @@ BOOL cmsxIT8SaveToFile(LCMSHANDLE hIT8, const char* cFileName) /* Reads whole file in a memory block */ static -BOOL ReadFileInMemory(const char *cFileName, char **Buffer, size_t *Len) +bool ReadFileInMemory(const char *cFileName, char **Buffer, size_t *Len) { FILE *fp; size_t Size; @@ -1162,10 +1162,10 @@ BOOL ReadFileInMemory(const char *cFileName, char **Buffer, size_t *Len) /* -------------------------------------------------------------- Higer lever parsing */ static -BOOL DataFormatSection(LPIT8 it8) +bool DataFormatSection(LPIT8 it8) { int iField = 0; - BOOL Ignoring = false; + bool Ignoring = false; InSymbol(it8); /* Eats "BEGIN_DATA_FORMAT" */ CheckEOLN(it8); @@ -1205,7 +1205,7 @@ BOOL DataFormatSection(LPIT8 it8) static -BOOL DataSection (LPIT8 it8) +bool DataSection (LPIT8 it8) { int iField = 0; int iSet = 0; @@ -1250,7 +1250,7 @@ BOOL DataSection (LPIT8 it8) static -BOOL HeaderSection (LPIT8 it8) +bool HeaderSection (LPIT8 it8) { char VarName[MAXID]; char Buffer[MAXSTR]; @@ -1298,7 +1298,7 @@ BOOL HeaderSection (LPIT8 it8) static -BOOL ParseIT8(LPIT8 it8) +bool ParseIT8(LPIT8 it8) { InSymbol(it8); @@ -1567,7 +1567,7 @@ int LocateSample(LPIT8 it8, const char* cSample) } -BOOL cmsxIT8GetDataSetByPos(LCMSHANDLE hIT8, int col, int row, char* Val, int ValBufferLen) +bool cmsxIT8GetDataSetByPos(LCMSHANDLE hIT8, int col, int row, char* Val, int ValBufferLen) { LPIT8 it8 = (LPIT8) hIT8; const char *data = GetData(it8, row, col); @@ -1584,7 +1584,7 @@ BOOL cmsxIT8GetDataSetByPos(LCMSHANDLE hIT8, int col, int row, char* Val, int Va -BOOL cmsxIT8GetDataSet(LCMSHANDLE hIT8, const char* cPatch, +bool cmsxIT8GetDataSet(LCMSHANDLE hIT8, const char* cPatch, const char* cSample, char* Val, int ValBuffLen) { @@ -1611,7 +1611,7 @@ BOOL cmsxIT8GetDataSet(LCMSHANDLE hIT8, const char* cPatch, } -BOOL cmsxIT8GetDataSetDbl(LCMSHANDLE it8, const char* cPatch, const char* cSample, double* v) +bool cmsxIT8GetDataSetDbl(LCMSHANDLE it8, const char* cPatch, const char* cSample, double* v) { char Buffer[20]; @@ -1625,7 +1625,7 @@ BOOL cmsxIT8GetDataSetDbl(LCMSHANDLE it8, const char* cPatch, const char* cSampl -BOOL cmsxIT8SetDataSet(LCMSHANDLE hIT8, const char* cPatch, +bool cmsxIT8SetDataSet(LCMSHANDLE hIT8, const char* cPatch, const char* cSample, char *Val) { @@ -1673,7 +1673,7 @@ BOOL cmsxIT8SetDataSet(LCMSHANDLE hIT8, const char* cPatch, } -BOOL cmsxIT8SetDataSetDbl(LCMSHANDLE hIT8, const char* cPatch, +bool cmsxIT8SetDataSetDbl(LCMSHANDLE hIT8, const char* cPatch, const char* cSample, double Val) { diff --git a/src/libs/lprof/lcmsprf.h b/src/libs/lprof/lcmsprf.h index 00c7ac40..5ccec828 100644 --- a/src/libs/lprof/lcmsprf.h +++ b/src/libs/lprof/lcmsprf.h @@ -71,7 +71,7 @@ typedef struct { // See B.K.O #148930: compile with lcms v.1.17 #if (LCMS_VERSION > 116) -typedef LCMSBOOL BOOL; +typedef LCMSBOOL bool; #endif LPMATN cdecl MATNalloc(int Rows, int Cols); @@ -80,7 +80,7 @@ LPMATN cdecl MATNmult(LPMATN a1, LPMATN a2); double cdecl MATNcross(LPMATN a); void cdecl MATNscalar (LPMATN a, double scl, LPMATN b); LPMATN cdecl MATNtranspose (LPMATN a); -BOOL cdecl MATNsolve(LPMATN a, LPMATN b); +bool cdecl MATNsolve(LPMATN a, LPMATN b); /* IT8.7 / CGATS.17-200x handling -------------------------------------------------------- */ @@ -97,31 +97,31 @@ LCMSHANDLE cdecl cmsxIT8Alloc(void); void cdecl cmsxIT8Free(LCMSHANDLE cmsxIT8); LCMSHANDLE cdecl cmsxIT8LoadFromFile(const char* cFileName); LCMSHANDLE cdecl cmsxIT8LoadFromMem(void *Ptr, size_t len); -BOOL cdecl cmsxIT8SaveToFile(LCMSHANDLE cmsxIT8, const char* cFileName); +bool cdecl cmsxIT8SaveToFile(LCMSHANDLE cmsxIT8, const char* cFileName); const char* cdecl cmsxIT8GetSheetType(LCMSHANDLE hIT8); -BOOL cdecl cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); +bool cdecl cmsxIT8SetSheetType(LCMSHANDLE hIT8, const char* Type); const char* cdecl cmsxIT8GetPatchName(LCMSHANDLE hIT8, int nPatch, char* buffer); -BOOL cdecl cmsxIT8SetProperty(LCMSHANDLE hcmsxIT8, const char* cProp, const char *Str); -BOOL cdecl cmsxIT8SetPropertyDbl(LCMSHANDLE hcmsxIT8, const char* cProp, double Val); +bool cdecl cmsxIT8SetProperty(LCMSHANDLE hcmsxIT8, const char* cProp, const char *Str); +bool cdecl cmsxIT8SetPropertyDbl(LCMSHANDLE hcmsxIT8, const char* cProp, double Val); const char* cdecl cmsxIT8GetProperty(LCMSHANDLE hcmsxIT8, const char* cProp); double cdecl cmsxIT8GetPropertyDbl(LCMSHANDLE hcmsxIT8, const char* cProp); int cdecl cmsxIT8EnumProperties(LCMSHANDLE cmsxIT8, char ***PropertyNames); int cdecl cmsxIT8EnumDataFormat(LCMSHANDLE cmsxIT8, char ***SampleNames); -BOOL cdecl cmsxIT8SetDataFormat(LCMSHANDLE cmsxIT8, int n, const char *Sample); +bool cdecl cmsxIT8SetDataFormat(LCMSHANDLE cmsxIT8, int n, const char *Sample); -BOOL cdecl cmsxIT8GetDataSetByPos(LCMSHANDLE IT8, int col, int row, char* Val, int ValBufferLen); +bool cdecl cmsxIT8GetDataSetByPos(LCMSHANDLE IT8, int col, int row, char* Val, int ValBufferLen); -BOOL cdecl cmsxIT8GetDataSet(LCMSHANDLE cmsxIT8, const char* cPatch, +bool cdecl cmsxIT8GetDataSet(LCMSHANDLE cmsxIT8, const char* cPatch, const char* cSample, char* Val, int ValBuffLen); -BOOL cdecl cmsxIT8GetDataSetDbl(LCMSHANDLE cmsxIT8, const char* cPatch, const char* cSample, double* v); +bool cdecl cmsxIT8GetDataSetDbl(LCMSHANDLE cmsxIT8, const char* cPatch, const char* cSample, double* v); -BOOL cdecl cmsxIT8SetDataSet(LCMSHANDLE cmsxIT8, const char* cPatch, +bool cdecl cmsxIT8SetDataSet(LCMSHANDLE cmsxIT8, const char* cPatch, const char* cSample, char *Val); -BOOL cdecl cmsxIT8SetDataSetDbl(LCMSHANDLE cmsxIT8, const char* cPatch, const char* cSample, double Val); +bool cdecl cmsxIT8SetDataSetDbl(LCMSHANDLE cmsxIT8, const char* cPatch, const char* cSample, double Val); const char *cdecl cmsxIT8GenericPatchName(int nPatch, char* buffer); @@ -178,10 +178,10 @@ typedef struct { -/* A set of patches is simply an array of bools, TRUE if the patch */ +/* A set of patches is simply an array of bools, true if the patch */ /* belong to the set, false otherwise. */ -typedef BOOL* SETOFPATCHES; +typedef bool* SETOFPATCHES; /* This struct holds whole Patches collection */ @@ -195,18 +195,18 @@ typedef struct _measurement { void cdecl cmsxPCollFreeMeasurements(LPMEASUREMENT m); -SETOFPATCHES cdecl cmsxPCollBuildSet(LPMEASUREMENT m, BOOL lDefault); +SETOFPATCHES cdecl cmsxPCollBuildSet(LPMEASUREMENT m, bool lDefault); -BOOL cdecl cmsxPCollBuildMeasurement(LPMEASUREMENT m, +bool cdecl cmsxPCollBuildMeasurement(LPMEASUREMENT m, const char *ReferenceSheet, const char *MeasurementSheet, DWORD dwNeededSamplesType); int cdecl cmsxPCollCountSet(LPMEASUREMENT m, SETOFPATCHES Set); -BOOL cdecl cmsxPCollValidatePatches(LPMEASUREMENT m, DWORD dwFlags); +bool cdecl cmsxPCollValidatePatches(LPMEASUREMENT m, DWORD dwFlags); -BOOL cdecl cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet); -BOOL cdecl cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8); +bool cdecl cmsxPCollLoadFromSheet(LPMEASUREMENT m, LCMSHANDLE hSheet); +bool cdecl cmsxPCollSaveToSheet(LPMEASUREMENT m, LCMSHANDLE it8); LPPATCH cdecl cmsxPCollGetPatch(LPMEASUREMENT m, int n); LPPATCH cdecl cmsxPCollGetPatchByName(LPMEASUREMENT m, const char* Name, int* lpPos); @@ -275,16 +275,16 @@ int cdecl cmsxRegressionCreateMatrix(LPMEASUREMENT m, SETOFPATCHES Allowed, int int ColorSpace, LPMATN* lpMat, LPMLRSTATISTICS Stat); -BOOL cdecl cmsxRegressionRGB2Lab(double r, double g, double b, +bool cdecl cmsxRegressionRGB2Lab(double r, double g, double b, LPMATN tfm, LPcmsCIELab Lab); -BOOL cdecl cmsxRegressionRGB2XYZ(double r, double g, double b, +bool cdecl cmsxRegressionRGB2XYZ(double r, double g, double b, LPMATN tfm, LPcmsCIEXYZ XYZ); -BOOL cdecl cmsxRegressionInterpolatorRGB(LPMEASUREMENT m, +bool cdecl cmsxRegressionInterpolatorRGB(LPMEASUREMENT m, int ColorSpace, int RegressionTerms, - BOOL lUseLocalPatches, + bool lUseLocalPatches, int MinPatchesToCollect, double r, double g, double b, void* Res); @@ -301,18 +301,18 @@ LCMSHANDLE cdecl cmsxLevenbergMarquardtInit(LPSAMPLEDCURVE x, LPSAMPLEDCURVE y, double cdecl cmsxLevenbergMarquardtAlamda(LCMSHANDLE hMRQ); double cdecl cmsxLevenbergMarquardtChiSq(LCMSHANDLE hMRQ); -BOOL cdecl cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ); -BOOL cdecl cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ); +bool cdecl cmsxLevenbergMarquardtIterate(LCMSHANDLE hMRQ); +bool cdecl cmsxLevenbergMarquardtFree(LCMSHANDLE hMRQ); /* Convex hull geometric routines ------------------------------------------------------------ */ LCMSHANDLE cdecl cmsxHullInit(void); void cdecl cmsxHullDone(LCMSHANDLE hHull); -BOOL cdecl cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z); -BOOL cdecl cmsxHullComputeHull(LCMSHANDLE hHull); +bool cdecl cmsxHullAddPoint(LCMSHANDLE hHull, int x, int y, int z); +bool cdecl cmsxHullComputeHull(LCMSHANDLE hHull); char cdecl cmsxHullCheckpoint(LCMSHANDLE hHull, int x, int y, int z); -BOOL cdecl cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname); +bool cdecl cmsxHullDumpVRML(LCMSHANDLE hHull, const char* fname); /* Linearization ---------------------------------------------------------------------------- */ @@ -343,7 +343,7 @@ void cdecl _cmsxClampXYZ100(LPcmsCIEXYZ xyz); /* Matrix shaper profiler API ------------------------------------------------------------- */ -BOOL cdecl cmsxComputeMatrixShaper(const char* ReferenceSheet, +bool cdecl cmsxComputeMatrixShaper(const char* ReferenceSheet, const char* MeasurementSheet, int Medium, LPGAMMATABLE TransferCurves[3], @@ -402,7 +402,7 @@ typedef struct { LCMSHANDLE hRGBHull; /* Contains bobbin of valid RGB values */ /* CIECAM97s */ - BOOL lUseCIECAM97s; /* Use CIECAM97s for chromatic adaptation? */ + bool lUseCIECAM97s; /* Use CIECAM97s for chromatic adaptation? */ cmsViewingConditions device; /* Viewing condition of source */ cmsViewingConditions PCS; /* Viewing condition of PCS */ @@ -416,15 +416,15 @@ typedef struct { /* Shared routines */ -BOOL cdecl cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr); -BOOL cdecl cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr); -BOOL cdecl cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxEmbedCharTarget(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxEmbedMatrixShaper(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxEmbedTextualInfo(LPPROFILERCOMMONDATA hdr); -int cdecl cmsxFindOptimumNumOfTerms(LPPROFILERCOMMONDATA hdr, int nMaxTerms, BOOL* lAllOk); -void cdecl cmsxChromaticAdaptationAndNormalization(LPPROFILERCOMMONDATA hdr, LPcmsCIEXYZ xyz, BOOL lReverse); +int cdecl cmsxFindOptimumNumOfTerms(LPPROFILERCOMMONDATA hdr, int nMaxTerms, bool* lAllOk); +void cdecl cmsxChromaticAdaptationAndNormalization(LPPROFILERCOMMONDATA hdr, LPcmsCIEXYZ xyz, bool lReverse); void cdecl cmsxInitPCSViewingConditions(LPPROFILERCOMMONDATA hdr); void cdecl cmsxComputeGamutHull(LPPROFILERCOMMONDATA hdr); -BOOL cdecl cmsxChoosePCS(LPPROFILERCOMMONDATA hdr); +bool cdecl cmsxChoosePCS(LPPROFILERCOMMONDATA hdr); /* Monitor profiler API ------------------------------------------------------------------- */ @@ -447,8 +447,8 @@ typedef struct { -BOOL cdecl cmsxMonitorProfilerInit(LPMONITORPROFILERDATA sys); -BOOL cdecl cmsxMonitorProfilerDo(LPMONITORPROFILERDATA sys); +bool cdecl cmsxMonitorProfilerInit(LPMONITORPROFILERDATA sys); +bool cdecl cmsxMonitorProfilerDo(LPMONITORPROFILERDATA sys); /* Scanner profiler API ------------------------------------------------------------------- */ @@ -463,7 +463,7 @@ typedef struct { LPMATN HiTerms; /* Regression matrix of many terms */ LPMATN LoTerms; /* Low order regression matrix used for extrapolation */ - BOOL lLocalConvergenceExtrapolation; + bool lLocalConvergenceExtrapolation; } SCANNERPROFILERDATA,FAR* LPSCANNERPROFILERDATA; @@ -471,8 +471,8 @@ typedef struct { -BOOL cdecl cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys); -BOOL cdecl cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys); +bool cdecl cmsxScannerProfilerInit(LPSCANNERPROFILERDATA sys); +bool cdecl cmsxScannerProfilerDo(LPSCANNERPROFILERDATA sys); /* ----------------------------------------------------------- end of profilers */ diff --git a/src/libs/sqlite2/attach.c b/src/libs/sqlite2/attach.c index 316d0d2a..51011616 100644 --- a/src/libs/sqlite2/attach.c +++ b/src/libs/sqlite2/attach.c @@ -179,8 +179,8 @@ void sqliteDetach(Parse *pParse, Token *pDbname){ ** Initialize a DbFixer structure. This routine must be called prior ** to passing the structure to one of the sqliteFixAAAA() routines below. ** -** The return value indicates whether or not fixation is required. TRUE -** means we do need to fix the database references, FALSE means we do not. +** The return value indicates whether or not fixation is required. true +** means we do need to fix the database references, false means we do not. */ int sqliteFixInit( DbFixer *pFix, /* The fixer to be initialized */ diff --git a/src/libs/sqlite2/btree.c b/src/libs/sqlite2/btree.c index 745bdda2..447cb244 100644 --- a/src/libs/sqlite2/btree.c +++ b/src/libs/sqlite2/btree.c @@ -679,7 +679,7 @@ static void pageDestructor(void *pData){ */ int sqliteBtreeOpen( const char *zFilename, /* Name of the file containing the BTree database */ - int omitJournal, /* if TRUE then do not journal this file */ + int omitJournal, /* if true then do not journal this file */ int nCache, /* How many pages in the page cache */ Btree **ppBtree /* Pointer to new Btree object written here */ ){ diff --git a/src/libs/sqlite2/build.c b/src/libs/sqlite2/build.c index 6c17f140..ac6b4890 100644 --- a/src/libs/sqlite2/build.c +++ b/src/libs/sqlite2/build.c @@ -994,7 +994,7 @@ void sqliteCreateView( Token *pBegin, /* The CREATE token that begins the statement */ Token *pName, /* The token that holds the name of the view */ Select *pSelect, /* A SELECT statement that will become the new view */ - int isTemp /* TRUE for a TEMPORARY view */ + int isTemp /* true for a TEMPORARY view */ ){ Table *p; int n; diff --git a/src/libs/sqlite2/expr.c b/src/libs/sqlite2/expr.c index af4aa596..98cdb14e 100644 --- a/src/libs/sqlite2/expr.c +++ b/src/libs/sqlite2/expr.c @@ -371,7 +371,7 @@ int sqliteExprIsInteger(Expr *p, int *pValue){ } /* -** Return TRUE if the given string is a row-id column name. +** Return true if the given string is a row-id column name. */ int sqliteIsRowid(const char *z){ if( sqliteStrICmp(z, "_ROWID_")==0 ) return 1; @@ -1270,7 +1270,7 @@ void sqliteExprCode(Parse *pParse, Expr *pExpr){ int sqliteExprCodeExprList( Parse *pParse, /* Parsing context */ ExprList *pList, /* The expression list to be coded */ - int includeTypes /* TRUE to put datatypes on the stack too */ + int includeTypes /* true to put datatypes on the stack too */ ){ struct ExprList_item *pItem; int i, n; @@ -1486,8 +1486,8 @@ void sqliteExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int jumpIfNull){ } /* -** Do a deep comparison of two expression trees. Return TRUE (non-zero) -** if they are identical and return FALSE if they differ in any way. +** Do a deep comparison of two expression trees. Return true (non-zero) +** if they are identical and return false if they differ in any way. */ int sqliteExprCompare(Expr *pA, Expr *pB){ int i; diff --git a/src/libs/sqlite2/insert.c b/src/libs/sqlite2/insert.c index 2f73db4a..37f9a8b3 100644 --- a/src/libs/sqlite2/insert.c +++ b/src/libs/sqlite2/insert.c @@ -188,8 +188,8 @@ void sqliteInsert( assert( pSelect->pEList ); nColumn = pSelect->pEList->nExpr; - /* Set useTempTable to TRUE if the result of the SELECT statement - ** should be written into a temporary table. Set to FALSE if each + /* Set useTempTable to true if the result of the SELECT statement + ** should be written into a temporary table. Set to false if each ** row of the SELECT can be written directly into the result table. ** ** A temp table must be used if the table being updated is also one diff --git a/src/libs/sqlite2/main.c b/src/libs/sqlite2/main.c index 7541b171..1a2861b6 100644 --- a/src/libs/sqlite2/main.c +++ b/src/libs/sqlite2/main.c @@ -1109,7 +1109,7 @@ void *sqlite_commit_hook( int sqliteBtreeFactory( const sqlite *db, /* Main database when opening aux otherwise 0 */ const char *zFilename, /* Name of the file containing the BTree database */ - int omitJournal, /* if TRUE then do not journal this file */ + int omitJournal, /* if true then do not journal this file */ int nCache, /* How many pages in the page cache */ Btree **ppBtree){ /* Pointer to new Btree object written here */ diff --git a/src/libs/sqlite2/os.c b/src/libs/sqlite2/os.c index aaada0e3..f25da801 100644 --- a/src/libs/sqlite2/os.c +++ b/src/libs/sqlite2/os.c @@ -384,7 +384,7 @@ int sqliteOsDelete(const char *zFilename){ } /* -** Return TRUE if the named file exists. +** Return true if the named file exists. */ int sqliteOsFileExists(const char *zFilename){ #if OS_UNIX diff --git a/src/libs/sqlite2/pager.c b/src/libs/sqlite2/pager.c index 409f9201..31a767d1 100644 --- a/src/libs/sqlite2/pager.c +++ b/src/libs/sqlite2/pager.c @@ -107,9 +107,9 @@ struct PgHdr { PgHdr *pNextFree, *pPrevFree; /* Freelist of pages where nRef==0 */ PgHdr *pNextAll, *pPrevAll; /* A list of all pages */ PgHdr *pNextCkpt, *pPrevCkpt; /* List of pages in the checkpoint journal */ - u8 inJournal; /* TRUE if has been written to journal */ - u8 inCkpt; /* TRUE if written to the checkpoint journal */ - u8 dirty; /* TRUE if we need to write back changes */ + u8 inJournal; /* true if has been written to journal */ + u8 inCkpt; /* true if written to the checkpoint journal */ + u8 dirty; /* true if we need to write back changes */ u8 needSync; /* Sync journal before writing this page */ u8 alwaysRollback; /* Disable dont_rollback() for this page */ PgHdr *pDirty; /* Dirty pages sorted by PgHdr.pgno */ @@ -918,7 +918,7 @@ int sqlitepager_open( const char *zFilename, /* Name of the database file to open */ int mxPage, /* Max number of in-memory cache pages */ int nExtra, /* Extra bytes append to each in-memory page */ - int useJournal /* TRUE to use a rollback journal on this file */ + int useJournal /* true to use a rollback journal on this file */ ){ Pager *pPager; char *zFullPathname; @@ -1872,8 +1872,8 @@ int sqlitepager_write(void *pData){ } /* -** Return TRUE if the page given in the argument was previously passed -** to sqlitepager_write(). In other words, return TRUE if it is ok +** Return true if the page given in the argument was previously passed +** to sqlitepager_write(). In other words, return true if it is ok ** to change the content of the page. */ int sqlitepager_iswriteable(void *pData){ @@ -2076,7 +2076,7 @@ int sqlitepager_rollback(Pager *pPager){ } /* -** Return TRUE if the database file is opened read-only. Return FALSE +** Return true if the database file is opened read-only. Return false ** if the database is (in theory) writable. */ int sqlitepager_isreadonly(Pager *pPager){ diff --git a/src/libs/sqlite2/printf.c b/src/libs/sqlite2/printf.c index a5445f60..061881c9 100644 --- a/src/libs/sqlite2/printf.c +++ b/src/libs/sqlite2/printf.c @@ -320,14 +320,14 @@ static int vxprintf( /* ** At this point, variables are initialized as follows: ** - ** flag_alternateform TRUE if a '#' is present. - ** flag_plussign TRUE if a '+' is present. - ** flag_leftjustify TRUE if a '-' is present or if the + ** flag_alternateform true if a '#' is present. + ** flag_plussign true if a '+' is present. + ** flag_leftjustify true if a '-' is present or if the ** field width was negative. - ** flag_zeropad TRUE if the width began with 0. - ** flag_long TRUE if the letter 'l' (ell) prefixed + ** flag_zeropad true if the width began with 0. + ** flag_long true if the letter 'l' (ell) prefixed ** the conversion character. - ** flag_blanksign TRUE if a ' ' is present. + ** flag_blanksign true if a ' ' is present. ** width The specified field width. This is ** always non-negative. Zero is the default. ** precision The specified precision. The default diff --git a/src/libs/sqlite2/select.c b/src/libs/sqlite2/select.c index 4cf03606..ff11ee75 100644 --- a/src/libs/sqlite2/select.c +++ b/src/libs/sqlite2/select.c @@ -1089,7 +1089,7 @@ static int matchOrderbyToColumn( Select *pSelect, /* Match to result columns of this SELECT */ ExprList *pOrderBy, /* The ORDER BY values to match against columns */ int iTable, /* Insert this value in iTable */ - int mustComplete /* If TRUE all ORDER BYs must match */ + int mustComplete /* If true all ORDER BYs must match */ ){ int nErr = 0; int i, j; diff --git a/src/libs/sqlite2/shell.c b/src/libs/sqlite2/shell.c index dd3d9456..2e5091d8 100644 --- a/src/libs/sqlite2/shell.c +++ b/src/libs/sqlite2/shell.c @@ -949,7 +949,7 @@ static int do_meta_command(char *zLine, struct callback_data *p){ } /* -** Return TRUE if the last non-whitespace character in z[] is a semicolon. +** Return true if the last non-whitespace character in z[] is a semicolon. ** z[] is N characters long. */ static int _ends_with_semicolon(const char *z, int N){ @@ -982,7 +982,7 @@ static int _all_whitespace(const char *z){ } /* -** Return TRUE if the line typed in is an SQL command terminator other +** Return true if the line typed in is an SQL command terminator other ** than a semi-colon. The SQL Server style "go" command is understood ** as is the Oracle "/". */ diff --git a/src/libs/sqlite2/sqlite.h b/src/libs/sqlite2/sqlite.h index ef461bf7..bdad7c73 100644 --- a/src/libs/sqlite2/sqlite.h +++ b/src/libs/sqlite2/sqlite.h @@ -740,7 +740,7 @@ int sqlite_reset(sqlite_vm*, char **pzErrMsg); ** to bind the value to. The left most '?' is 1. The 3rd parameter is ** the value to assign to that variable. The 4th parameter is the number ** of bytes in the value, including the terminating \000 for strings. -** Finally, the 5th "copy" parameter is TRUE if SQLite should make its +** Finally, the 5th "copy" parameter is true if SQLite should make its ** own private copy of this value, or false if the space that the 3rd ** parameter points to will be unchanging and can be used directly by ** SQLite. diff --git a/src/libs/sqlite2/sqliteInt.h b/src/libs/sqlite2/sqliteInt.h index 3c4d818a..20c05ff0 100644 --- a/src/libs/sqlite2/sqliteInt.h +++ b/src/libs/sqlite2/sqliteInt.h @@ -372,7 +372,7 @@ struct sqlite { struct sqliteInitInfo { /* Information used during initialization */ int iDb; /* When back is being initialized */ int newTnum; /* Rootpage of table being initialized */ - u8 busy; /* TRUE if currently initializing */ + u8 busy; /* true if currently initializing */ } init; struct Vdbe *pVdbe; /* List of active virtual machines */ void (*xTrace)(void*,const char*); /* Trace function */ @@ -694,7 +694,7 @@ struct Expr { Token span; /* Complete text of the expression */ int iTable, iColumn; /* When op==TK_COLUMN, then this expr node means the ** iColumn-th field of the iTable-th table. */ - int iAgg; /* When op==TK_COLUMN and pParse->useAgg==TRUE, pull + int iAgg; /* When op==TK_COLUMN and pParse->useAgg==true, pull ** result from the iAgg-th element of the aggregator */ Select *pSelect; /* When the expression is a sub-select. Also the ** right side of "<expr> IN (<select>)" */ @@ -900,7 +900,7 @@ struct Select { ** If AggExpr.pExpr==0, that means the expression is "count(*)". */ struct AggExpr { - int isAgg; /* if TRUE contains an aggregate function */ + int isAgg; /* if true contains an aggregate function */ Expr *pExpr; /* The expression */ FuncDef *pFunc; /* Information about the aggregate function */ }; @@ -920,7 +920,7 @@ struct Parse { const char *zTail; /* All SQL text past the last semicolon parsed */ Table *pNewTable; /* A table being constructed by CREATE TABLE */ Vdbe *pVdbe; /* An engine for executing database bytecode */ - u8 colNamesSet; /* TRUE after OP_ColumnName has been issued to pVdbe */ + u8 colNamesSet; /* true after OP_ColumnName has been issued to pVdbe */ u8 explain; /* True if the EXPLAIN flag is found on the query */ u8 nameClash; /* A permanent table name clashes with temp table name */ u8 useAgg; /* If true, extract field values from the aggregator diff --git a/src/libs/sqlite2/tokenize.c b/src/libs/sqlite2/tokenize.c index 1044e8a5..713cf803 100644 --- a/src/libs/sqlite2/tokenize.c +++ b/src/libs/sqlite2/tokenize.c @@ -506,7 +506,7 @@ abort_parse: #define tkOTHER 7 /* -** Return TRUE if the given SQL string ends in a semicolon. +** Return true if the given SQL string ends in a semicolon. ** ** Special handling is require for CREATE TRIGGER statements. ** Whenever the CREATE TRIGGER keywords are seen, the statement diff --git a/src/libs/sqlite2/trigger.c b/src/libs/sqlite2/trigger.c index 8442bb5d..aa5f8026 100644 --- a/src/libs/sqlite2/trigger.c +++ b/src/libs/sqlite2/trigger.c @@ -501,7 +501,7 @@ void sqliteDropTriggerPtr(Parse *pParse, Trigger *pTrigger, int nested){ ** pEList is the SET clause of an UPDATE statement. Each entry ** in pEList is of the format <id>=<expr>. If any of the entries ** in pEList have an <id> which matches an identifier in pIdList, -** then return TRUE. If pIdList==NULL, then it is considered a +** then return true. If pIdList==NULL, then it is considered a ** wildcard that matches anything. Likewise if pEList==NULL then ** it matches anything so always return true. Return false only ** if there is no match. @@ -515,7 +515,7 @@ static int checkColumnOverLap(IdList *pIdList, ExprList *pEList){ return 0; } -/* A global variable that is TRUE if we should always set up temp tables for +/* A global variable that is true if we should always set up temp tables for * for triggers, even if there are no triggers to code. This is used to test * how much overhead the triggers algorithm is causing. * diff --git a/src/libs/sqlite2/util.c b/src/libs/sqlite2/util.c index 579bf753..2382b8d1 100644 --- a/src/libs/sqlite2/util.c +++ b/src/libs/sqlite2/util.c @@ -514,7 +514,7 @@ int sqliteStrNICmp(const char *zLeft, const char *zRight, int N){ } /* -** Return TRUE if z is a pure numeric string. Return FALSE if the +** Return true if z is a pure numeric string. Return false if the ** string contains any character which is not part of a number. ** ** Am empty string is considered non-numeric. @@ -608,9 +608,9 @@ double sqliteAtoF(const char *z, const char **pzEnd){ ** The string zNum represents an integer. There might be some other ** information following the integer too, but that part is ignored. ** If the integer that the prefix of zNum represents will fit in a -** 32-bit signed integer, return TRUE. Otherwise return FALSE. +** 32-bit signed integer, return true. Otherwise return false. ** -** This routine returns FALSE for the string -2147483648 even that +** This routine returns false for the string -2147483648 even that ** that number will, in theory fit in a 32-bit integer. But positive ** 2147483648 will not fit in 32 bits. So it seems safer to return ** false. @@ -692,7 +692,7 @@ int sqliteCompare(const char *atext, const char *btext){ ** D Sort as strings in descending order. ** ** For the "+" and "-" sorting, pure numeric strings (strings for which the -** isNum() function above returns TRUE) always compare less than strings +** isNum() function above returns true) always compare less than strings ** that are not pure numerics. Non-numeric strings compare in memcmp() ** order. This is the same sort order as the sqliteCompare() function ** above generates. diff --git a/src/libs/sqlite2/vdbe.c b/src/libs/sqlite2/vdbe.c index 1838691c..26c82a33 100644 --- a/src/libs/sqlite2/vdbe.c +++ b/src/libs/sqlite2/vdbe.c @@ -277,7 +277,7 @@ static void popStack(Mem **ppTos, int N){ } /* -** Return TRUE if zNum is a 32-bit signed integer and write +** Return true if zNum is a 32-bit signed integer and write ** the value of the integer into *pNum. If zNum is not an integer ** or is an integer that is too large to be expressed with just 32 ** bits, then return false. @@ -1618,7 +1618,7 @@ case OP_StrGe: { case OP_And: case OP_Or: { Mem *pNos = &pTos[-1]; - int v1, v2; /* 0==TRUE, 1==FALSE, 2==UNKNOWN or NULL */ + int v1, v2; /* 0==true, 1==false, 2==UNKNOWN or NULL */ assert( pNos>=p->aStack ); if( pTos->flags & MEM_Null ){ diff --git a/src/libs/sqlite2/vdbeInt.h b/src/libs/sqlite2/vdbeInt.h index 79b6b51a..ca784e4b 100644 --- a/src/libs/sqlite2/vdbeInt.h +++ b/src/libs/sqlite2/vdbeInt.h @@ -250,7 +250,7 @@ struct Vdbe { int nVar; /* Number of entries in azVariable[] */ char **azVar; /* Values for the OP_Variable opcode */ int *anVar; /* Length of each value in azVariable[] */ - u8 *abVar; /* TRUE if azVariable[i] needs to be sqliteFree()ed */ + u8 *abVar; /* true if azVariable[i] needs to be sqliteFree()ed */ char *zLine; /* A single line from the input file */ int nLineAlloc; /* Number of spaces allocated for zLine */ int magic; /* Magic number for sanity checking */ diff --git a/src/libs/sqlite2/where.c b/src/libs/sqlite2/where.c index ea427719..52421fb4 100644 --- a/src/libs/sqlite2/where.c +++ b/src/libs/sqlite2/where.c @@ -143,7 +143,7 @@ static int exprTableUsage(ExprMaskSet *pMaskSet, Expr *p){ } /* -** Return TRUE if the given operator is one of the operators that is +** Return true if the given operator is one of the operators that is ** allowed for an indexable WHERE clause. The allowed operators are ** "=", "<", ">", "<=", ">=", and "IN". */ @@ -381,7 +381,7 @@ WhereInfo *sqliteWhereBegin( Parse *pParse, /* The parser context */ SrcList *pTabList, /* A list of all tables to be scanned */ Expr *pWhere, /* The WHERE clause */ - int pushKey, /* If TRUE, leave the table key on the stack */ + int pushKey, /* If true, leave the table key on the stack */ ExprList **ppOrderBy /* An ORDER BY clause, or NULL */ ){ int i; /* Loop counter */ diff --git a/src/libs/sqlite3/sqlite3.c b/src/libs/sqlite3/sqlite3.c index 87195d9a..41e94472 100644 --- a/src/libs/sqlite3/sqlite3.c +++ b/src/libs/sqlite3/sqlite3.c @@ -5320,7 +5320,7 @@ struct sqlite3_module { ** Where OP is =, <, <=, >, or >=. ** The particular operator is stored ** in aConstraint[].op. The index of the column is stored in -** aConstraint[].iColumn. aConstraint[].usable is TRUE if the +** aConstraint[].iColumn. aConstraint[].usable is true if the ** expr on the right-hand side can be evaluated (and thus the constraint ** is usable) and false if it cannot. ** @@ -7782,7 +7782,7 @@ struct sqlite3 { struct sqlite3InitInfo { /* Information used during initialization */ int iDb; /* When back is being initialized */ int newTnum; /* Rootpage of table being initialized */ - u8 busy; /* TRUE if currently initializing */ + u8 busy; /* true if currently initializing */ } init; int nExtension; /* Number of loaded extensions */ void **aExtension; /* Array of shared libraray handles */ @@ -8623,7 +8623,7 @@ struct Select { u8 isResolved; /* True once sqlite3SelectResolve() has run. */ u8 isAgg; /* True if this is an aggregate query */ u8 usesEphm; /* True if uses an OpenEphemeral opcode */ - u8 disallowOrderBy; /* Do not allow an ORDER BY to be attached if TRUE */ + u8 disallowOrderBy; /* Do not allow an ORDER BY to be attached if true */ char affinity; /* MakeRecord with this affinity for SRT_Set */ SrcList *pSrc; /* The FROM clause */ Expr *pWhere; /* The WHERE clause */ @@ -8691,7 +8691,7 @@ struct Parse { int rc; /* Return code from execution */ char *zErrMsg; /* An error message */ Vdbe *pVdbe; /* An engine for executing database bytecode */ - u8 colNamesSet; /* TRUE after OP_ColumnName has been issued to pVdbe */ + u8 colNamesSet; /* true after OP_ColumnName has been issued to pVdbe */ u8 nameClash; /* A permanent table name clashes with temp table name */ u8 checkSchema; /* Causes schema cookie check after an error */ u8 nested; /* Number of nested calls to the parser/code generator */ @@ -13047,7 +13047,7 @@ SQLITE_API sqlite3_mutex *sqlite3_mutex_alloc(int iType){ p = sqlite3MallocZero( sizeof(*p) ); if( p ){ p->id = iType; - if( DosCreateMutexSem( 0, &p->mutex, 0, FALSE ) != NO_ERROR ){ + if( DosCreateMutexSem( 0, &p->mutex, 0, false ) != NO_ERROR ){ sqlite3_free( p ); p = NULL; } @@ -13075,12 +13075,12 @@ SQLITE_API sqlite3_mutex *sqlite3_mutex_alloc(int iType){ ppib->pib_ulpid ); while( !isInit ){ mutex = 0; - rc = DosCreateMutexSem( name, &mutex, 0, FALSE); + rc = DosCreateMutexSem( name, &mutex, 0, false); if( rc == NO_ERROR ){ int i; if( !isInit ){ for( i = 0; i < sizeof(staticMutexes)/sizeof(staticMutexes[0]); i++ ){ - DosCreateMutexSem( 0, &staticMutexes[i].mutex, 0, FALSE ); + DosCreateMutexSem( 0, &staticMutexes[i].mutex, 0, false ); } isInit = 1; } @@ -14340,17 +14340,17 @@ static void vxprintf( /* ** At this point, variables are initialized as follows: ** - ** flag_alternateform TRUE if a '#' is present. - ** flag_altform2 TRUE if a '!' is present. - ** flag_plussign TRUE if a '+' is present. - ** flag_leftjustify TRUE if a '-' is present or if the + ** flag_alternateform true if a '#' is present. + ** flag_altform2 true if a '!' is present. + ** flag_plussign true if a '+' is present. + ** flag_leftjustify true if a '-' is present or if the ** field width was negative. - ** flag_zeropad TRUE if the width began with 0. - ** flag_long TRUE if the letter 'l' (ell) prefixed + ** flag_zeropad true if the width began with 0. + ** flag_long true if the letter 'l' (ell) prefixed ** the conversion character. - ** flag_longlong TRUE if the letter 'll' (ell ell) prefixed + ** flag_longlong true if the letter 'll' (ell ell) prefixed ** the conversion character. - ** flag_blanksign TRUE if a ' ' is present. + ** flag_blanksign true if a ' ' is present. ** width The specified field width. This is ** always non-negative. Zero is the default. ** precision The specified precision. The default @@ -16203,10 +16203,10 @@ SQLITE_PRIVATE int sqlite3StrNICmp(const char *zLeft, const char *zRight, int N) } /* -** Return TRUE if z is a pure numeric string. Return FALSE if the +** Return true if z is a pure numeric string. Return false if the ** string contains any character which is not part of a number. If ** the string is numeric and contains the '.' character, set *realnum -** to TRUE (otherwise FALSE). +** to true (otherwise false). ** ** An empty string is considered non-numeric. */ @@ -16344,7 +16344,7 @@ static int compare2pow63(const char *zNum){ /* -** Return TRUE if zNum is a 64-bit signed integer and write +** Return true if zNum is a 64-bit signed integer and write ** the value of the integer into *pNum. If zNum is not an integer ** or is an integer that is too large to be expressed with 64 bits, ** then return false. @@ -16391,9 +16391,9 @@ SQLITE_PRIVATE int sqlite3Atoi64(const char *zNum, i64 *pNum){ ** The string zNum represents an integer. There might be some other ** information following the integer too, but that part is ignored. ** If the integer that the prefix of zNum represents will fit in a -** 64-bit signed integer, return TRUE. Otherwise return FALSE. +** 64-bit signed integer, return true. Otherwise return false. ** -** This routine returns FALSE for the string -9223372036854775808 even that +** This routine returns false for the string -9223372036854775808 even that ** that number will, in theory fit in a 64-bit integer. Positive ** 9223373036854775808 will not fit in 64 bits. So it seems safer to return ** false. @@ -21846,9 +21846,9 @@ SQLITE_API int sqlite3_open_file_count = 0; #if OS_WINCE typedef struct winceLock { int nReaders; /* Number of reader locks obtained */ - BOOL bPending; /* Indicates a pending lock has been obtained */ - BOOL bReserved; /* Indicates a reserved lock has been obtained */ - BOOL bExclusive; /* Indicates an exclusive lock has been obtained */ + bool bPending; /* Indicates a pending lock has been obtained */ + bool bReserved; /* Indicates a reserved lock has been obtained */ + bool bExclusive; /* Indicates an exclusive lock has been obtained */ } winceLock; #endif @@ -22101,10 +22101,10 @@ static void winceMutexAcquire(HANDLE h){ ** Create the mutex and shared memory used for locking in the file ** descriptor pFile */ -static BOOL winceCreateLock(const char *zFilename, winFile *pFile){ +static bool winceCreateLock(const char *zFilename, winFile *pFile){ WCHAR *zTok; WCHAR *zName = utf8ToUnicode(zFilename); - BOOL bInit = TRUE; + bool bInit = true; /* Initialize the local lockdata */ ZeroMemory(&pFile->local, sizeof(pFile->local)); @@ -22117,10 +22117,10 @@ static BOOL winceCreateLock(const char *zFilename, winFile *pFile){ } /* Create/open the named mutex */ - pFile->hMutex = CreateMutexW(NULL, FALSE, zName); + pFile->hMutex = CreateMutexW(NULL, false, zName); if (!pFile->hMutex){ free(zName); - return FALSE; + return false; } /* Acquire the mutex before continuing */ @@ -22138,7 +22138,7 @@ static BOOL winceCreateLock(const char *zFilename, winFile *pFile){ /* Set a flag that indicates we're the first to create the memory so it ** must be zero-initialized */ if (GetLastError() == ERROR_ALREADY_EXISTS){ - bInit = FALSE; + bInit = false; } free(zName); @@ -22159,7 +22159,7 @@ static BOOL winceCreateLock(const char *zFilename, winFile *pFile){ winceMutexRelease(pFile->hMutex); CloseHandle(pFile->hMutex); pFile->hMutex = NULL; - return FALSE; + return false; } /* Initialize the shared memory if we're supposed to */ @@ -22168,7 +22168,7 @@ static BOOL winceCreateLock(const char *zFilename, winFile *pFile){ } winceMutexRelease(pFile->hMutex); - return TRUE; + return true; } /* @@ -22185,13 +22185,13 @@ static void winceDestroyLock(winFile *pFile){ pFile->shared->nReaders --; } if (pFile->local.bReserved){ - pFile->shared->bReserved = FALSE; + pFile->shared->bReserved = false; } if (pFile->local.bPending){ - pFile->shared->bPending = FALSE; + pFile->shared->bPending = false; } if (pFile->local.bExclusive){ - pFile->shared->bExclusive = FALSE; + pFile->shared->bExclusive = false; } /* De-reference and close our copy of the shared memory handle */ @@ -22208,7 +22208,7 @@ static void winceDestroyLock(winFile *pFile){ /* ** An implementation of the LockFile() API of windows for wince */ -static BOOL winceLockFile( +static bool winceLockFile( HANDLE *phFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, @@ -22216,18 +22216,18 @@ static BOOL winceLockFile( DWORD nNumberOfBytesToLockHigh ){ winFile *pFile = HANDLE_TO_WINFILE(phFile); - BOOL bReturn = FALSE; + bool bReturn = false; - if (!pFile->hMutex) return TRUE; + if (!pFile->hMutex) return true; winceMutexAcquire(pFile->hMutex); /* Wanting an exclusive lock? */ if (dwFileOffsetLow == SHARED_FIRST && nNumberOfBytesToLockLow == SHARED_SIZE){ if (pFile->shared->nReaders == 0 && pFile->shared->bExclusive == 0){ - pFile->shared->bExclusive = TRUE; - pFile->local.bExclusive = TRUE; - bReturn = TRUE; + pFile->shared->bExclusive = true; + pFile->local.bExclusive = true; + bReturn = true; } } @@ -22240,7 +22240,7 @@ static BOOL winceLockFile( if (pFile->local.nReaders == 1){ pFile->shared->nReaders ++; } - bReturn = TRUE; + bReturn = true; } } @@ -22248,17 +22248,17 @@ static BOOL winceLockFile( else if (dwFileOffsetLow == PENDING_BYTE && nNumberOfBytesToLockLow == 1){ /* If no pending lock has been acquired, then acquire it */ if (pFile->shared->bPending == 0) { - pFile->shared->bPending = TRUE; - pFile->local.bPending = TRUE; - bReturn = TRUE; + pFile->shared->bPending = true; + pFile->local.bPending = true; + bReturn = true; } } /* Want a reserved lock? */ else if (dwFileOffsetLow == RESERVED_BYTE && nNumberOfBytesToLockLow == 1){ if (pFile->shared->bReserved == 0) { - pFile->shared->bReserved = TRUE; - pFile->local.bReserved = TRUE; - bReturn = TRUE; + pFile->shared->bReserved = true; + pFile->local.bReserved = true; + bReturn = true; } } @@ -22269,7 +22269,7 @@ static BOOL winceLockFile( /* ** An implementation of the UnlockFile API of windows for wince */ -static BOOL winceUnlockFile( +static bool winceUnlockFile( HANDLE *phFile, DWORD dwFileOffsetLow, DWORD dwFileOffsetHigh, @@ -22277,9 +22277,9 @@ static BOOL winceUnlockFile( DWORD nNumberOfBytesToUnlockHigh ){ winFile *pFile = HANDLE_TO_WINFILE(phFile); - BOOL bReturn = FALSE; + bool bReturn = false; - if (!pFile->hMutex) return TRUE; + if (!pFile->hMutex) return true; winceMutexAcquire(pFile->hMutex); /* Releasing a reader lock or an exclusive lock */ @@ -22287,9 +22287,9 @@ static BOOL winceUnlockFile( dwFileOffsetLow < SHARED_FIRST + SHARED_SIZE){ /* Did we have an exclusive lock? */ if (pFile->local.bExclusive){ - pFile->local.bExclusive = FALSE; - pFile->shared->bExclusive = FALSE; - bReturn = TRUE; + pFile->local.bExclusive = false; + pFile->shared->bExclusive = false; + bReturn = true; } /* Did we just have a reader lock? */ @@ -22299,24 +22299,24 @@ static BOOL winceUnlockFile( { pFile->shared->nReaders --; } - bReturn = TRUE; + bReturn = true; } } /* Releasing a pending lock */ else if (dwFileOffsetLow == PENDING_BYTE && nNumberOfBytesToUnlockLow == 1){ if (pFile->local.bPending){ - pFile->local.bPending = FALSE; - pFile->shared->bPending = FALSE; - bReturn = TRUE; + pFile->local.bPending = false; + pFile->shared->bPending = false; + bReturn = true; } } /* Releasing a reserved lock */ else if (dwFileOffsetLow == RESERVED_BYTE && nNumberOfBytesToUnlockLow == 1){ if (pFile->local.bReserved) { - pFile->local.bReserved = FALSE; - pFile->shared->bReserved = FALSE; - bReturn = TRUE; + pFile->local.bReserved = false; + pFile->shared->bReserved = false; + bReturn = true; } } @@ -22327,7 +22327,7 @@ static BOOL winceUnlockFile( /* ** An implementation of the LockFileEx() API of windows for wince */ -static BOOL winceLockFileEx( +static bool winceLockFileEx( HANDLE *phFile, DWORD dwFlags, DWORD dwReserved, @@ -22342,7 +22342,7 @@ static BOOL winceLockFileEx( nNumberOfBytesToLockLow == SHARED_SIZE){ return winceLockFile(phFile, SHARED_FIRST, 0, 1, 0); } - return FALSE; + return false; } /* ** End of the special code for wince @@ -23920,8 +23920,8 @@ struct PgHdr { PgHdr *pNextHash, *pPrevHash; /* Hash collision chain for PgHdr.pgno */ PagerLruLink free; /* Next and previous free pages */ PgHdr *pNextAll; /* A list of all pages */ - u8 inJournal; /* TRUE if has been written to journal */ - u8 dirty; /* TRUE if we need to write back changes */ + u8 inJournal; /* true if has been written to journal */ + u8 dirty; /* true if we need to write back changes */ u8 needSync; /* Sync journal before writing this page */ u8 alwaysRollback; /* Disable DontRollback() for this page */ u8 needRead; /* Read content if PagerWrite() is called */ @@ -23953,7 +23953,7 @@ struct PgHistory { u8 *pOrig; /* Original page text. Restore to this on a full rollback */ u8 *pStmt; /* Text as it was at the beginning of the current statement */ PgHdr *pNextStmt, *pPrevStmt; /* List of pages in the statement journal */ - u8 inStmt; /* TRUE if in the statement subjournal */ + u8 inStmt; /* true if in the statement subjournal */ }; /* @@ -28073,8 +28073,8 @@ SQLITE_PRIVATE int sqlite3PagerWrite(DbPage *pDbPage){ } /* -** Return TRUE if the page given in the argument was previously passed -** to sqlite3PagerWrite(). In other words, return TRUE if it is ok +** Return true if the page given in the argument was previously passed +** to sqlite3PagerWrite(). In other words, return true if it is ok ** to change the content of the page. */ #ifndef NDEBUG @@ -28561,7 +28561,7 @@ SQLITE_PRIVATE int sqlite3PagerRollback(Pager *pPager){ } /* -** Return TRUE if the database file is opened read-only. Return FALSE +** Return true if the database file is opened read-only. Return false ** if the database is (in theory) writable. */ SQLITE_PRIVATE int sqlite3PagerIsreadonly(Pager *pPager){ @@ -28762,7 +28762,7 @@ SQLITE_PRIVATE const char *sqlite3PagerJournalname(Pager *pPager){ } /* -** Return true if fsync() calls are disabled for this pager. Return FALSE +** Return true if fsync() calls are disabled for this pager. Return false ** if fsync()s are executed normally. */ SQLITE_PRIVATE int sqlite3PagerNosync(Pager *pPager){ @@ -31443,8 +31443,8 @@ SQLITE_PRIVATE int sqlite3BtreeSetSafetyLevel(Btree *p, int level, int fullSync) #endif /* -** Return TRUE if the given btree is set to safety level 1. In other -** words, return TRUE if no sync() occurs on the disk files. +** Return true if the given btree is set to safety level 1. In other +** words, return true if no sync() occurs on the disk files. */ SQLITE_PRIVATE int sqlite3BtreeSyncDisabled(Btree *p){ BtShared *pBt = p->pBt; @@ -33703,11 +33703,11 @@ moveto_finish: /* -** Return TRUE if the cursor is not pointing at an entry of the table. +** Return true if the cursor is not pointing at an entry of the table. ** -** TRUE will be returned after a call to sqlite3BtreeNext() moves +** true will be returned after a call to sqlite3BtreeNext() moves ** past the last entry in the table or sqlite3BtreePrev() moves past -** the first entry. TRUE is also returned if the table is empty. +** the first entry. true is also returned if the table is empty. */ SQLITE_PRIVATE int sqlite3BtreeEof(BtCursor *pCur){ /* TODO: What if the cursor is in CURSOR_REQUIRESEEK but all table entries @@ -40895,7 +40895,7 @@ int vdbeReprepare(Vdbe *p){ /* -** Return TRUE (non-zero) of the statement supplied as an argument needs +** Return true (non-zero) of the statement supplied as an argument needs ** to be recompiled. A statement needs to be recompiled whenever the ** execution environment changes in a way that would alter the program ** that sqlite3_prepare() generates. For example, if new functions or @@ -43699,7 +43699,7 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ */ case OP_And: /* same as TK_AND, in1, in2, out3 */ case OP_Or: { /* same as TK_OR, in1, in2, out3 */ - int v1, v2; /* 0==FALSE, 1==TRUE, 2==UNKNOWN or NULL */ + int v1, v2; /* 0==false, 1==true, 2==UNKNOWN or NULL */ if( pIn1->flags & MEM_Null ){ v1 = 2; @@ -48519,7 +48519,7 @@ SQLITE_PRIVATE int sqlite3ExprIsInteger(Expr *p, int *pValue){ } /* -** Return TRUE if the given string is a row-id column name. +** Return true if the given string is a row-id column name. */ SQLITE_PRIVATE int sqlite3IsRowid(const char *z){ if( sqlite3StrICmp(z, "_ROWID_")==0 ) return 1; @@ -50250,7 +50250,7 @@ SQLITE_PRIVATE int sqlite3ExprCodeAndCache(Parse *pParse, Expr *pExpr, int targe } /* -** Return TRUE if pExpr is an constant expression that is appropriate +** Return true if pExpr is an constant expression that is appropriate ** for factoring out of a loop. Appropriate expressions are: ** ** * Any expression that evaluates to two or more opcodes. @@ -50674,18 +50674,18 @@ SQLITE_PRIVATE void sqlite3ExprIfFalse(Parse *pParse, Expr *pExpr, int dest, int } /* -** Do a deep comparison of two expression trees. Return TRUE (non-zero) -** if they are identical and return FALSE if they differ in any way. +** Do a deep comparison of two expression trees. Return true (non-zero) +** if they are identical and return false if they differ in any way. ** -** Sometimes this routine will return FALSE even if the two expressions +** Sometimes this routine will return false even if the two expressions ** really are equivalent. If we cannot prove that the expressions are -** identical, we return FALSE just to be safe. So if this routine +** identical, we return false just to be safe. So if this routine ** returns false, then you do not really know for certain if the two -** expressions are the same. But if you get a TRUE return, then you +** expressions are the same. But if you get a true return, then you ** can be sure the expressions are the same. In the places where -** this routine is used, it does not hurt to get an extra FALSE - that +** this routine is used, it does not hurt to get an extra false - that ** just might result in some slightly slower code. But returning -** an incorrect TRUE could lead to a malfunction. +** an incorrect true could lead to a malfunction. */ SQLITE_PRIVATE int sqlite3ExprCompare(Expr *pA, Expr *pB){ int i; @@ -52418,8 +52418,8 @@ SQLITE_PRIVATE void sqlite3AttachFunctions(sqlite3 *db){ ** Initialize a DbFixer structure. This routine must be called prior ** to passing the structure to one of the sqliteFixAAAA() routines below. ** -** The return value indicates whether or not fixation is required. TRUE -** means we do need to fix the database references, FALSE means we do not. +** The return value indicates whether or not fixation is required. true +** means we do need to fix the database references, false means we do not. */ SQLITE_PRIVATE int sqlite3FixInit( DbFixer *pFix, /* The fixer to be initialized */ @@ -54434,7 +54434,7 @@ SQLITE_PRIVATE void sqlite3CreateView( Token *pName1, /* The token that holds the name of the view */ Token *pName2, /* The token that holds the name of the view */ Select *pSelect, /* A SELECT statement that will become the new view */ - int isTemp, /* TRUE for a TEMPORARY view */ + int isTemp, /* true for a TEMPORARY view */ int noErr /* Suppress error messages if VIEW already exists */ ){ Table *p; @@ -58574,8 +58574,8 @@ SQLITE_PRIVATE void sqlite3RegisterLikeFunctions(sqlite3 *db, int caseSensitive) ** pExpr points to an expression which implements a function. If ** it is appropriate to apply the LIKE optimization to that function ** then set aWc[0] through aWc[2] to the wildcard characters and -** return TRUE. If the function is not a LIKE-style function then -** return FALSE. +** return true. If the function is not a LIKE-style function then +** return false. */ SQLITE_PRIVATE int sqlite3IsLikeFunction(sqlite3 *db, Expr *pExpr, int *pIsNocase, char *aWc){ FuncDef *pDef; @@ -59109,8 +59109,8 @@ SQLITE_PRIVATE void sqlite3Insert( assert( pSelect->pEList ); nColumn = pSelect->pEList->nExpr; - /* Set useTempTable to TRUE if the result of the SELECT statement - ** should be written into a temporary table. Set to FALSE if each + /* Set useTempTable to true if the result of the SELECT statement + ** should be written into a temporary table. Set to false if each ** row of the SELECT can be written directly into the result table. ** ** A temp table must be used if the table being updated is also one @@ -60040,9 +60040,9 @@ static int xferCompatibleIndex(Index *pDest, Index *pSrc){ ** the indices of tab2 are transfered to tab1 as well. In so doing, ** the resulting tab1 has much less fragmentation. ** -** This routine returns TRUE if the optimization is attempted. If any +** This routine returns true if the optimization is attempted. If any ** of the conditions above fail so that the optimization should not -** be attempted, then this routine returns FALSE. +** be attempted, then this routine returns false. */ static int xferOptimization( Parse *pParse, /* Parser context */ @@ -65045,7 +65045,7 @@ static int processOrderGroupBy( Select *pSelect, /* The SELECT statement containing the clause */ ExprList *pOrderBy, /* The ORDER BY or GROUP BY clause to be processed */ int isOrder, /* 1 for ORDER BY. 0 for GROUP BY */ - u8 *pHasAgg /* Set to TRUE if any term contains an aggregate */ + u8 *pHasAgg /* Set to true if any term contains an aggregate */ ){ int i; sqlite3 *db = pParse->db; @@ -67942,7 +67942,7 @@ SQLITE_PRIVATE void sqlite3UnlinkAndDeleteTrigger(sqlite3 *db, int iDb, const ch ** pEList is the SET clause of an UPDATE statement. Each entry ** in pEList is of the format <id>=<expr>. If any of the entries ** in pEList have an <id> which matches an identifier in pIdList, -** then return TRUE. If pIdList==NULL, then it is considered a +** then return true. If pIdList==NULL, then it is considered a ** wildcard that matches anything. Likewise if pEList==NULL then ** it matches anything so always return true. Return false only ** if there is no match. @@ -70367,7 +70367,7 @@ static Bitmask exprSelectTableUsage(ExprMaskSet *pMaskSet, Select *pS){ } /* -** Return TRUE if the given operator is one of the operators that is +** Return true if the given operator is one of the operators that is ** allowed for an indexable WHERE clause term. The allowed operators are ** "=", "<", ">", "<=", ">=", and "IN". */ @@ -70510,7 +70510,7 @@ static void exprAnalyzeAll( #ifndef SQLITE_OMIT_LIKE_OPTIMIZATION /* ** Check to see if the given expression is a LIKE or GLOB operator that -** can be optimized using inequality constraints. Return TRUE if it is +** can be optimized using inequality constraints. Return true if it is ** so and false if not. ** ** In order for the operator to be optimizible, the RHS must be a string @@ -70578,7 +70578,7 @@ static int isLikeOrGlob( ** ** column MATCH expr ** -** If it is then return TRUE. If not, return FALSE. +** If it is then return true. If not, return false. */ static int isMatchOfColumn( Expr *pExpr /* Test this expression */ @@ -70614,7 +70614,7 @@ static void transferJoinMarkings(Expr *pDerived, Expr *pBase){ #if !defined(SQLITE_OMIT_OR_OPTIMIZATION) && !defined(SQLITE_OMIT_SUBQUERY) /* -** Return TRUE if the given term of an OR clause can be converted +** Return true if the given term of an OR clause can be converted ** into an IN clause. The iCursor and iColumn define the left-hand ** side of the IN clause. ** @@ -70988,7 +70988,7 @@ or_not_possible: } /* -** Return TRUE if any of the expressions in pList->a[iFirst...] contain +** Return true if any of the expressions in pList->a[iFirst...] contain ** a reference to any table other than the iBase table. */ static int referencesOtherTables( @@ -76788,7 +76788,7 @@ SQLITE_PRIVATE const char sqlite3IsEbcdicIdChar[]; #define tkEND 7 /* -** Return TRUE if the given SQL string ends in a semicolon. +** Return true if the given SQL string ends in a semicolon. ** ** Special handling is require for CREATE TRIGGER statements. ** Whenever the CREATE TRIGGER keywords are seen, the statement @@ -77777,7 +77777,7 @@ SQLITE_API void *sqlite3_rollback_hook( SQLITE_PRIVATE int sqlite3BtreeFactory( const sqlite3 *db, /* Main database when opening aux otherwise 0 */ const char *zFilename, /* Name of the file containing the BTree database */ - int omitJournal, /* if TRUE then do not journal this file */ + int omitJournal, /* if true then do not journal this file */ int nCache, /* How many pages in the page cache */ int vfsFlags, /* Flags passed through to vfsOpen */ Btree **ppBtree /* Pointer to new Btree object written here */ @@ -78406,7 +78406,7 @@ SQLITE_API int sqlite3_global_recover(void){ /* ** Test to see whether or not the database connection is in autocommit -** mode. Return TRUE if it is and FALSE if not. Autocommit mode is on +** mode. Return true if it is and false if not. Autocommit mode is on ** by default. Autocommit is disabled by a BEGIN statement and reenabled ** by the next COMMIT or ROLLBACK. ** @@ -85971,7 +85971,7 @@ static int m_gt_1(const char *z){ } /* -** Return TRUE if there is a vowel anywhere within z[0..n-1] +** Return true if there is a vowel anywhere within z[0..n-1] */ static int hasVowel(const char *z){ while( isConsonant(z) ){ z++; } @@ -85979,7 +85979,7 @@ static int hasVowel(const char *z){ } /* -** Return TRUE if the word ends in a double consonant. +** Return true if the word ends in a double consonant. ** ** The text is reversed here. So we are really looking at ** the first two characters of z[]. @@ -85989,7 +85989,7 @@ static int doubleConsonant(const char *z){ } /* -** Return TRUE if the word ends with three letters which +** Return true if the word ends with three letters which ** are consonant-vowel-consonent and where the final consonant ** is not 'w', 'x', or 'y'. ** @@ -86012,8 +86012,8 @@ static int star_oh(const char *z){ ** The input word *pz and zFrom are both in reverse order. zTo ** is in normal order. ** -** Return TRUE if zFrom matches. Return FALSE if zFrom does not -** match. Not that TRUE is returned even if xCond() fails and +** Return true if zFrom matches. Return false if zFrom does not +** match. Not that true is returned even if xCond() fails and ** no substitution occurs. */ static int stem( diff --git a/src/libs/sqlite3/sqlite3.h b/src/libs/sqlite3/sqlite3.h index 57837cbb..3ffc4334 100644 --- a/src/libs/sqlite3/sqlite3.h +++ b/src/libs/sqlite3/sqlite3.h @@ -4927,7 +4927,7 @@ struct sqlite3_module { ** Where OP is =, <, <=, >, or >=. ** The particular operator is stored ** in aConstraint[].op. The index of the column is stored in -** aConstraint[].iColumn. aConstraint[].usable is TRUE if the +** aConstraint[].iColumn. aConstraint[].usable is true if the ** expr on the right-hand side can be evaluated (and thus the constraint ** is usable) and false if it cannot. ** diff --git a/src/libs/themeengine/themeengine.cpp b/src/libs/themeengine/themeengine.cpp index 3f5ff65c..8d874067 100644 --- a/src/libs/themeengine/themeengine.cpp +++ b/src/libs/themeengine/themeengine.cpp @@ -836,7 +836,7 @@ bool ThemeEngine::saveTheme() themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("BannerBorder")); - e.setAttribute(TQString::fromLatin1("value"), (t->bannerBorder ? "TRUE" : "FALSE")); + e.setAttribute(TQString::fromLatin1("value"), (t->bannerBorder ? "true" : "false")); themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("BannerBorderColor")); @@ -905,7 +905,7 @@ bool ThemeEngine::saveTheme() themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorder")); - e.setAttribute(TQString::fromLatin1("value"), (t->thumbRegBorder ? "TRUE" : "FALSE")); + e.setAttribute(TQString::fromLatin1("value"), (t->thumbRegBorder ? "true" : "false")); themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailRegularBorderColor")); @@ -974,7 +974,7 @@ bool ThemeEngine::saveTheme() themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorder")); - e.setAttribute(TQString::fromLatin1("value"), (t->thumbSelBorder ? "TRUE" : "FALSE")); + e.setAttribute(TQString::fromLatin1("value"), (t->thumbSelBorder ? "true" : "false")); themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ThumbnailSelectedBorderColor")); @@ -1043,7 +1043,7 @@ bool ThemeEngine::saveTheme() themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorder")); - e.setAttribute(TQString::fromLatin1("value"), (t->listRegBorder ? "TRUE" : "FALSE")); + e.setAttribute(TQString::fromLatin1("value"), (t->listRegBorder ? "true" : "false")); themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ListviewRegularBorderColor")); @@ -1112,7 +1112,7 @@ bool ThemeEngine::saveTheme() themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorder")); - e.setAttribute(TQString::fromLatin1("value"), (t->listSelBorder ? "TRUE" : "FALSE")); + e.setAttribute(TQString::fromLatin1("value"), (t->listSelBorder ? "true" : "false")); themeElem.appendChild(e); e = xmlDoc.createElement(TQString::fromLatin1("ListviewSelectedBorderColor")); diff --git a/src/utilities/imageeditor/canvas/iccsettingscontainer.h b/src/utilities/imageeditor/canvas/iccsettingscontainer.h index eadb12fb..e292a6e5 100644 --- a/src/utilities/imageeditor/canvas/iccsettingscontainer.h +++ b/src/utilities/imageeditor/canvas/iccsettingscontainer.h @@ -63,8 +63,8 @@ public: bool enableCMSetting; - // FALSE -> apply - // TRUE -> ask + // false -> apply + // true -> ask bool askOrApplySetting; bool BPCSetting; bool managedViewSetting; diff --git a/translations/messages/nl.po b/translations/messages/nl.po index 2270803c..98b3fc53 100644 --- a/translations/messages/nl.po +++ b/translations/messages/nl.po @@ -47,8 +47,8 @@ msgid "" "_: EMAIL OF TRANSLATORS\n" "Your emails" msgstr "" -",[email protected],[email protected],f.de.kruijf@hetnet." -"nl,[email protected]" #: digikam/album.cpp:327 digikam/albumfolderview.cpp:268 #: digikam/albumfolderview.cpp:588 digikam/albumfolderview.cpp:1063 |