OpenSystemsDevelopment / qpdf

Commit 63a643a3c750c2cb6e667d5bbfc443080140832c

Authored by Jay Berkenbilt
1 parent d71f05ca

Remove implicit conversion from int/pointer to bool 

This fixes cases of warning C4800 from msvc
Inline Side-by-side
Showing 3 changed files with 53 additions and 49 deletions
libqpdf/QPDFObject.cc
  View file @63a643a
... ... @@ -26,11 +26,11 @@ QPDFObject::getDescription(QPDF*& qpdf, std::string& description)
26 26 {
27 27 qpdf = this->m->owning_qpdf;
28 28 description = this->m->object_description;
29   - return this->m->owning_qpdf;
  29 + return this->m->owning_qpdf != 0;
30 30 }
31 31  
32 32 bool
33 33 QPDFObject::hasDescription()
34 34 {
35   - return this->m->owning_qpdf;
  35 + return this->m->owning_qpdf != 0;
36 36 }
... ...
libqpdf/QPDF_encryption.cc
  View file @63a643a
... ... @@ -1425,7 +1425,7 @@ static bool
1425 1425 is_bit_set(int P, int bit)
1426 1426 {
1427 1427 // Bits in P are numbered from 1 in the spec
1428   - return (P & (1 << (bit - 1)));
  1428 + return ((P & (1 << (bit - 1))) != 0);
1429 1429 }
1430 1430  
1431 1431 bool
... ...
libqpdf/qpdf-c.cc
  View file @63a643a
... ... @@ -257,19 +257,19 @@ QPDF_ERROR_CODE qpdf_check_pdf(qpdf_data qpdf)
257 257 void qpdf_set_suppress_warnings(qpdf_data qpdf, QPDF_BOOL value)
258 258 {
259 259 QTC::TC("qpdf", "qpdf-c called qpdf_set_suppress_warnings");
260   - qpdf->qpdf->setSuppressWarnings(value);
  260 + qpdf->qpdf->setSuppressWarnings(value == QPDF_TRUE);
261 261 }
262 262  
263 263 void qpdf_set_ignore_xref_streams(qpdf_data qpdf, QPDF_BOOL value)
264 264 {
265 265 QTC::TC("qpdf", "qpdf-c called qpdf_set_ignore_xref_streams");
266   - qpdf->qpdf->setIgnoreXRefStreams(value);
  266 + qpdf->qpdf->setIgnoreXRefStreams(value == QPDF_TRUE);
267 267 }
268 268  
269 269 void qpdf_set_attempt_recovery(qpdf_data qpdf, QPDF_BOOL value)
270 270 {
271 271 QTC::TC("qpdf", "qpdf-c called qpdf_set_attempt_recovery");
272   - qpdf->qpdf->setAttemptRecovery(value);
  272 + qpdf->qpdf->setAttemptRecovery(value == QPDF_TRUE);
273 273 }
274 274  
275 275 QPDF_ERROR_CODE qpdf_read(qpdf_data qpdf, char const* filename,
... ... @@ -398,55 +398,55 @@ QPDF_BOOL qpdf_is_encrypted(qpdf_data qpdf)
398 398 QPDF_BOOL qpdf_allow_accessibility(qpdf_data qpdf)
399 399 {
400 400 QTC::TC("qpdf", "qpdf-c called qpdf_allow_accessibility");
401   - return qpdf->qpdf->allowAccessibility();
  401 + return (qpdf->qpdf->allowAccessibility() ? QPDF_TRUE : QPDF_FALSE);
402 402 }
403 403  
404 404 QPDF_BOOL qpdf_allow_extract_all(qpdf_data qpdf)
405 405 {
406 406 QTC::TC("qpdf", "qpdf-c called qpdf_allow_extract_all");
407   - return qpdf->qpdf->allowExtractAll();
  407 + return (qpdf->qpdf->allowExtractAll() ? QPDF_TRUE : QPDF_FALSE);
408 408 }
409 409  
410 410 QPDF_BOOL qpdf_allow_print_low_res(qpdf_data qpdf)
411 411 {
412 412 QTC::TC("qpdf", "qpdf-c called qpdf_allow_print_low_res");
413   - return qpdf->qpdf->allowPrintLowRes();
  413 + return (qpdf->qpdf->allowPrintLowRes() ? QPDF_TRUE : QPDF_FALSE);
414 414 }
415 415  
416 416 QPDF_BOOL qpdf_allow_print_high_res(qpdf_data qpdf)
417 417 {
418 418 QTC::TC("qpdf", "qpdf-c called qpdf_allow_print_high_res");
419   - return qpdf->qpdf->allowPrintHighRes();
  419 + return (qpdf->qpdf->allowPrintHighRes() ? QPDF_TRUE : QPDF_FALSE);
420 420 }
421 421  
422 422 QPDF_BOOL qpdf_allow_modify_assembly(qpdf_data qpdf)
423 423 {
424 424 QTC::TC("qpdf", "qpdf-c called qpdf_allow_modify_assembly");
425   - return qpdf->qpdf->allowModifyAssembly();
  425 + return (qpdf->qpdf->allowModifyAssembly() ? QPDF_TRUE : QPDF_FALSE);
426 426 }
427 427  
428 428 QPDF_BOOL qpdf_allow_modify_form(qpdf_data qpdf)
429 429 {
430 430 QTC::TC("qpdf", "qpdf-c called qpdf_allow_modify_form");
431   - return qpdf->qpdf->allowModifyForm();
  431 + return (qpdf->qpdf->allowModifyForm() ? QPDF_TRUE : QPDF_FALSE);
432 432 }
433 433  
434 434 QPDF_BOOL qpdf_allow_modify_annotation(qpdf_data qpdf)
435 435 {
436 436 QTC::TC("qpdf", "qpdf-c called qpdf_allow_modify_annotation");
437   - return qpdf->qpdf->allowModifyAnnotation();
  437 + return (qpdf->qpdf->allowModifyAnnotation() ? QPDF_TRUE : QPDF_FALSE);
438 438 }
439 439  
440 440 QPDF_BOOL qpdf_allow_modify_other(qpdf_data qpdf)
441 441 {
442 442 QTC::TC("qpdf", "qpdf-c called qpdf_allow_modify_other");
443   - return qpdf->qpdf->allowModifyOther();
  443 + return (qpdf->qpdf->allowModifyOther() ? QPDF_TRUE : QPDF_FALSE);
444 444 }
445 445  
446 446 QPDF_BOOL qpdf_allow_modify_all(qpdf_data qpdf)
447 447 {
448 448 QTC::TC("qpdf", "qpdf-c called qpdf_allow_modify_all");
449   - return qpdf->qpdf->allowModifyAll();
  449 + return (qpdf->qpdf->allowModifyAll() ? QPDF_TRUE : QPDF_FALSE);
450 450 }
451 451  
452 452 static void qpdf_init_write_internal(qpdf_data qpdf)
... ... @@ -523,7 +523,7 @@ void qpdf_set_object_stream_mode(qpdf_data qpdf, qpdf_object_stream_e mode)
523 523 void qpdf_set_compress_streams(qpdf_data qpdf, QPDF_BOOL value)
524 524 {
525 525 QTC::TC("qpdf", "qpdf-c called qpdf_set_compress_streams");
526   - qpdf->qpdf_writer->setCompressStreams(value);
  526 + qpdf->qpdf_writer->setCompressStreams(value == QPDF_TRUE);
527 527 }
528 528  
529 529 void qpdf_set_decode_level(qpdf_data qpdf, qpdf_stream_decode_level_e level)
... ... @@ -535,13 +535,13 @@ void qpdf_set_decode_level(qpdf_data qpdf, qpdf_stream_decode_level_e level)
535 535 void qpdf_set_preserve_unreferenced_objects(qpdf_data qpdf, QPDF_BOOL value)
536 536 {
537 537 QTC::TC("qpdf", "qpdf-c called qpdf_set_preserve_unreferenced_objects");
538   - qpdf->qpdf_writer->setPreserveUnreferencedObjects(value);
  538 + qpdf->qpdf_writer->setPreserveUnreferencedObjects(value == QPDF_TRUE);
539 539 }
540 540  
541 541 void qpdf_set_newline_before_endstream(qpdf_data qpdf, QPDF_BOOL value)
542 542 {
543 543 QTC::TC("qpdf", "qpdf-c called qpdf_set_newline_before_endstream");
544   - qpdf->qpdf_writer->setNewlineBeforeEndstream(value);
  544 + qpdf->qpdf_writer->setNewlineBeforeEndstream(value == QPDF_TRUE);
545 545 }
546 546  
547 547 void qpdf_set_stream_data_mode(qpdf_data qpdf, qpdf_stream_data_e mode)
... ... @@ -553,44 +553,44 @@ void qpdf_set_stream_data_mode(qpdf_data qpdf, qpdf_stream_data_e mode)
553 553 void qpdf_set_content_normalization(qpdf_data qpdf, QPDF_BOOL value)
554 554 {
555 555 QTC::TC("qpdf", "qpdf-c called qpdf_set_content_normalization");
556   - qpdf->qpdf_writer->setContentNormalization(value);
  556 + qpdf->qpdf_writer->setContentNormalization(value == QPDF_TRUE);
557 557 }
558 558  
559 559 void qpdf_set_qdf_mode(qpdf_data qpdf, QPDF_BOOL value)
560 560 {
561 561 QTC::TC("qpdf", "qpdf-c called qpdf_set_qdf_mode");
562   - qpdf->qpdf_writer->setQDFMode(value);
  562 + qpdf->qpdf_writer->setQDFMode(value == QPDF_TRUE);
563 563 }
564 564  
565 565 void qpdf_set_deterministic_ID(qpdf_data qpdf, QPDF_BOOL value)
566 566 {
567 567 QTC::TC("qpdf", "qpdf-c called qpdf_set_deterministic_ID");
568   - qpdf->qpdf_writer->setDeterministicID(value);
  568 + qpdf->qpdf_writer->setDeterministicID(value == QPDF_TRUE);
569 569 }
570 570  
571 571 void qpdf_set_static_ID(qpdf_data qpdf, QPDF_BOOL value)
572 572 {
573 573 QTC::TC("qpdf", "qpdf-c called qpdf_set_static_ID");
574   - qpdf->qpdf_writer->setStaticID(value);
  574 + qpdf->qpdf_writer->setStaticID(value == QPDF_TRUE);
575 575 }
576 576  
577 577 void qpdf_set_static_aes_IV(qpdf_data qpdf, QPDF_BOOL value)
578 578 {
579 579 QTC::TC("qpdf", "qpdf-c called qpdf_set_static_aes_IV");
580   - qpdf->qpdf_writer->setStaticAesIV(value);
  580 + qpdf->qpdf_writer->setStaticAesIV(value == QPDF_TRUE);
581 581 }
582 582  
583 583 void qpdf_set_suppress_original_object_IDs(
584 584 qpdf_data qpdf, QPDF_BOOL value)
585 585 {
586 586 QTC::TC("qpdf", "qpdf-c called qpdf_set_suppress_original_object_IDs");
587   - qpdf->qpdf_writer->setSuppressOriginalObjectIDs(value);
  587 + qpdf->qpdf_writer->setSuppressOriginalObjectIDs(value == QPDF_TRUE);
588 588 }
589 589  
590 590 void qpdf_set_preserve_encryption(qpdf_data qpdf, QPDF_BOOL value)
591 591 {
592 592 QTC::TC("qpdf", "qpdf-c called qpdf_set_preserve_encryption");
593   - qpdf->qpdf_writer->setPreserveEncryption(value);
  593 + qpdf->qpdf_writer->setPreserveEncryption(value == QPDF_TRUE);
594 594 }
595 595  
596 596 void qpdf_set_r2_encryption_parameters(
... ... @@ -601,7 +601,8 @@ void qpdf_set_r2_encryption_parameters(
601 601 QTC::TC("qpdf", "qpdf-c called qpdf_set_r2_encryption_parameters");
602 602 qpdf->qpdf_writer->setR2EncryptionParameters(
603 603 user_password, owner_password,
604   - allow_print, allow_modify, allow_extract, allow_annotate);
  604 + allow_print == QPDF_TRUE, allow_modify == QPDF_TRUE,
  605 + allow_extract == QPDF_TRUE, allow_annotate == QPDF_TRUE);
605 606 }
606 607  
607 608 void qpdf_set_r3_encryption_parameters2(
... ... @@ -614,9 +615,9 @@ void qpdf_set_r3_encryption_parameters2(
614 615 QTC::TC("qpdf", "qpdf-c called qpdf_set_r3_encryption_parameters");
615 616 qpdf->qpdf_writer->setR3EncryptionParameters(
616 617 user_password, owner_password,
617   - allow_accessibility, allow_extract,
618   - allow_assemble, allow_annotate_and_form,
619   - allow_form_filling, allow_modify_other,
  618 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  619 + allow_assemble == QPDF_TRUE, allow_annotate_and_form == QPDF_TRUE,
  620 + allow_form_filling == QPDF_TRUE, allow_modify_other == QPDF_TRUE,
620 621 print);
621 622 }
622 623  
... ... @@ -631,10 +632,10 @@ void qpdf_set_r4_encryption_parameters2(
631 632 QTC::TC("qpdf", "qpdf-c called qpdf_set_r4_encryption_parameters");
632 633 qpdf->qpdf_writer->setR4EncryptionParameters(
633 634 user_password, owner_password,
634   - allow_accessibility, allow_extract,
635   - allow_assemble, allow_annotate_and_form,
636   - allow_form_filling, allow_modify_other,
637   - print, encrypt_metadata, use_aes);
  635 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  636 + allow_assemble == QPDF_TRUE, allow_annotate_and_form == QPDF_TRUE,
  637 + allow_form_filling == QPDF_TRUE, allow_modify_other == QPDF_TRUE,
  638 + print, encrypt_metadata == QPDF_TRUE, use_aes == QPDF_TRUE);
638 639 }
639 640  
640 641  
... ... @@ -648,10 +649,10 @@ void qpdf_set_r5_encryption_parameters2(
648 649 QTC::TC("qpdf", "qpdf-c called qpdf_set_r5_encryption_parameters");
649 650 qpdf->qpdf_writer->setR5EncryptionParameters(
650 651 user_password, owner_password,
651   - allow_accessibility, allow_extract,
652   - allow_assemble, allow_annotate_and_form,
653   - allow_form_filling, allow_modify_other,
654   - print, encrypt_metadata);
  652 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  653 + allow_assemble == QPDF_TRUE, allow_annotate_and_form == QPDF_TRUE,
  654 + allow_form_filling == QPDF_TRUE, allow_modify_other == QPDF_TRUE,
  655 + print, encrypt_metadata == QPDF_TRUE);
655 656 }
656 657  
657 658 void qpdf_set_r6_encryption_parameters2(
... ... @@ -664,10 +665,10 @@ void qpdf_set_r6_encryption_parameters2(
664 665 QTC::TC("qpdf", "qpdf-c called qpdf_set_r6_encryption_parameters");
665 666 qpdf->qpdf_writer->setR6EncryptionParameters(
666 667 user_password, owner_password,
667   - allow_accessibility, allow_extract,
668   - allow_assemble, allow_annotate_and_form,
669   - allow_form_filling, allow_modify_other,
670   - print, encrypt_metadata);
  668 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  669 + allow_assemble == QPDF_TRUE, allow_annotate_and_form == QPDF_TRUE,
  670 + allow_form_filling == QPDF_TRUE, allow_modify_other == QPDF_TRUE,
  671 + print, encrypt_metadata == QPDF_TRUE);
671 672 }
672 673  
673 674 void qpdf_set_r3_encryption_parameters(
... ... @@ -677,7 +678,8 @@ void qpdf_set_r3_encryption_parameters(
677 678 {
678 679 qpdf->qpdf_writer->setR3EncryptionParameters(
679 680 user_password, owner_password,
680   - allow_accessibility, allow_extract, print, modify);
  681 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  682 + print, modify);
681 683 }
682 684  
683 685 void qpdf_set_r4_encryption_parameters(
... ... @@ -688,8 +690,9 @@ void qpdf_set_r4_encryption_parameters(
688 690 {
689 691 qpdf->qpdf_writer->setR4EncryptionParameters(
690 692 user_password, owner_password,
691   - allow_accessibility, allow_extract, print, modify,
692   - encrypt_metadata, use_aes);
  693 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  694 + print, modify,
  695 + encrypt_metadata == QPDF_TRUE, use_aes == QPDF_TRUE);
693 696 }
694 697  
695 698 void qpdf_set_r5_encryption_parameters(
... ... @@ -700,8 +703,9 @@ void qpdf_set_r5_encryption_parameters(
700 703 {
701 704 qpdf->qpdf_writer->setR5EncryptionParameters(
702 705 user_password, owner_password,
703   - allow_accessibility, allow_extract, print, modify,
704   - encrypt_metadata);
  706 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  707 + print, modify,
  708 + encrypt_metadata == QPDF_TRUE);
705 709 }
706 710  
707 711 void qpdf_set_r6_encryption_parameters(
... ... @@ -712,14 +716,14 @@ void qpdf_set_r6_encryption_parameters(
712 716 {
713 717 qpdf->qpdf_writer->setR6EncryptionParameters(
714 718 user_password, owner_password,
715   - allow_accessibility, allow_extract, print, modify,
716   - encrypt_metadata);
  719 + allow_accessibility == QPDF_TRUE, allow_extract == QPDF_TRUE,
  720 + print, modify, encrypt_metadata == QPDF_TRUE);
717 721 }
718 722  
719 723 void qpdf_set_linearization(qpdf_data qpdf, QPDF_BOOL value)
720 724 {
721 725 QTC::TC("qpdf", "qpdf-c called qpdf_set_linearization");
722   - qpdf->qpdf_writer->setLinearization(value);
  726 + qpdf->qpdf_writer->setLinearization(value == QPDF_TRUE);
723 727 }
724 728  
725 729 void qpdf_set_minimum_pdf_version(qpdf_data qpdf, char const* version)
... ...