File tree Expand file tree Collapse file tree 2 files changed +121
-116
lines changed Expand file tree Collapse file tree 2 files changed +121
-116
lines changed Original file line number Diff line number Diff line change @@ -613,10 +613,11 @@ void Cr3Decoder::decodeMetaDataInternal(const CameraMetaData* meta) {
613613 const auto camId = canonBox->CMT1 ()->mRootIFD0 ->getID ();
614614
615615 uint32_t iso = 0 ;
616- if (canonBox->CMT2 ()->mRootIFD0 ->hasEntryRecursive (ISOSPEEDRATINGS))
616+ if (canonBox->CMT2 ()->mRootIFD0 ->hasEntryRecursive (ISOSPEEDRATINGS)) {
617617 iso = canonBox->CMT2 ()
618618 ->mRootIFD0 ->getEntryRecursive (ISOSPEEDRATINGS)
619619 ->getU32 ();
620+ }
620621 if (65535 == iso) {
621622 // ISOSPEEDRATINGS is a SHORT EXIF value. For larger values, we have to look
622623 // at RECOMMENDED_EXPOSURE_INDEX (maybe Canon specific).
@@ -632,14 +633,14 @@ void Cr3Decoder::decodeMetaDataInternal(const CameraMetaData* meta) {
632633
633634 // CTMD
634635 auto & CTMD_stsd = track3Mdia->minf ->stbl ->stsd ;
635- assert (CTMD_stsd->dscs .size () > 0 );
636+ assert (! CTMD_stsd->dscs .empty () );
636637
637638 // Get Sample and rebuild a CTMD
638639 IsoMCanonTimedMetadataBox ctmd =
639640 IsoMCanonTimedMetadataBox (CTMD_stsd->dscs [0 ]);
640641
641642 // CTMD MDAT
642- assert (track3Mdia->minf ->stbl ->chunks .size () > 0 );
643+ assert (! track3Mdia->minf ->stbl ->chunks .empty () );
643644 auto ctmd_chunk = track3Mdia->minf ->stbl ->chunks [0 ];
644645
645646 Buffer ctmd_chunk_buf = ctmd_chunk->getSubView (0 );
You can’t perform that action at this time.
0 commit comments