-
-
Notifications
You must be signed in to change notification settings - Fork 686
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
WIP: Tweak FixedArray and derived constructors #130
WIP: Tweak FixedArray and derived constructors #130
Conversation
Niels suggested the change from ValueType[Dimension] (c-type ValueType*) to `ValueType(&)[Dimension]`. It is better now doubt, but it generates many breaking changes. That I do think it could be worth to fix. The main one that is too big to tackle right now is with all the interface of Cells. This had to be inherited from VTK, but the interface in ITK could enjoy a better interface than current raw pointers. VTK does use c-arrays instead of pointers. Compare VTK: https://github.com/Kitware/VTK/blob/a7909e67d7df88dcf81984923296442c7ccaca5b/Common/DataModel/vtkCell.h#L197-L199 With ITK: https://github.com/InsightSoftwareConsortium/ITK/blob/3a6158a416bd6f20882ac0dde27a0c1c50809991/Modules/Core/Common/include/itkCellInterface.h#L320-L326 ENH: Provide constructor from C-array to FixedArray Also derived classes of FixedArray, inherit constructors from base. `using Superclass::Superclass` This allow to remove some repetition and homogenize the interface. The only possible breaking change is marking as explicit two FixedArray converting constructors: ``` explicit FixedArray(const ValueType & ); template< typename TFixedArrayValueType > explicit FixedArray(const FixedArray< TFixedArrayValueType, VLength > & r) ``` The template conversion is needed to avoid unexpected conversion in derived classes. Also marking as explicit is in general a good practice. Users might use static_cast instead of relying in the non-existant implicit conversion. ITK_LEGACY_FUTURE_REMOVE was used to switch between the explicit or implicit constructor in itkVector. The switch is removed, that Vector behavior is now handled from its base class (FixedArray). COMP: Fix uninitialized FixedArray and const correctness This is a false positive, the variables are not used uninitialized, but we can solve it using the conversion constructor of FixedArray: `FixedArray(Value r[VLenght])` Also add missing const in SetNormal in LineSpatialObject Fix warning: ``` Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx: In member function ‘itk::MetaTubeConverter<NDimensions>::SpatialObjectPointer itk::MetaTubeConverter<NDimensions>::MetaObjectToSpatialObject(const MetaObjectType*) [with unsigned int NDimensions = 3]’: Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx:172:3: warning: ‘point’ may be used uninitialized in this function [-Wmaybe-uninitialized] m_X = newX; ^~~ Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx: In member function ‘itk::MetaVesselTubeConverter<NDimensions>::SpatialObjectPointer itk::MetaVesselTubeConverter<NDimensions>::MetaObjectToSpatialObject(const MetaObjectType*) [with unsigned int NDimensions = 3]’: /home/user/Software/ITK/ITK-src/Modules/Core/SpatialObjects/include/itkSpatialObjectPoint.hxx:172:3: warning: ‘point’ may be used uninitialized in this function [-Wmaybe-uninitialized] m_X = newX; ``` Change-Id: If848981580a542ea70ca6bc4c4b2f212e7b33c4b
http://review.source.kitware.com/#/c/23836/ Pablo He...z-Cerdan Pablo He...z-Cerdan Pablo He...z-Cerdan Dzenan Zukic Niels Dekker (2 comments) Cool! Looks like this fix allows you to declare the variables 'const', right? I would like that even better :-) Modules/Core/SpatialObjects/include/itkMetaLineConverter.hxx Line 83: Pablo He...z-Cerdan Pablo He...z-Cerdan Dzenan Zukic Kitware Build Robot Kitware Build Robot Pablo He...z-Cerdan Kitware Build Robot Pablo He...z-Cerdan Kitware Build Robot Pablo He...z-Cerdan Kitware Build Robot Pablo He...z-Cerdan Pablo He...z-Cerdan Niels Dekker (1 comment) @pablo, another aspect below here, please consider: Modules/Core/Common/include/itkFixedArray.h template Niels Dekker Pablo Hernandez-Cerdan (1 comment) Modules/Core/Common/include/itkFixedArray.h With this change, starting as early as in SetOrigin, SetSpacing in itkImageBase, propagates a bit. I think is for better, but again, good to discuss. Thanks Niels, next patch introduces your proposed change. Pablo He...z-Cerdan Pablo He...z-Cerdan Kitware Build Robot Niels Dekker Dzenan Zukic (4 comments) Commit Message Modules/Core/Common/include/itkFixedArray.h Modules/IO/SpatialObjects/test/itkReadWriteSpatialObjectTest.cxx Modules/Registration/Metricsv4/test/itkMeanSquaresImageToImageMetricv4VectorRegistrationTest.cxx Matt McCormick Cool stuff! Breaking out into separate patches should help. What changes can we make without breaking existing code? |
This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions. |
Who was spearheading this patch? |
/azp run all |
No pipelines are associated with this pull request. |
It is assigned to @phcerdan so I assume that he is the lead. I don't think it is a priority. |
I am not going to tackle this in a foreseeable future. Closing as the stale bot did. |
Fix typos in comments CMakeLists.txt: Export all symbols (InsightSoftwareConsortium#136) test/cctest/CMakeLists.txt: Added /bigobj for MSVC tests (InsightSoftwareConsortium#135) Add DOUBLE_CONVERSION_HAS_ATTRIBUTE to fix warnings on MSVC and enable for GCC. (InsightSoftwareConsortium#131) Fix broken MSVC builds. (InsightSoftwareConsortium#130) Add support for quiet and signaling NaNs to the ieee header. (InsightSoftwareConsortium#128) Move buffer and buffer_pos down (InsightSoftwareConsortium#125) * Move buffer and buffer_pos down Simplifies code by removing two asserts Optimize code with -ftrivial-auto-var-init=pattern by avoiding initialization when buffer is not used * Disable -ftrivial-auto-var-init=pattern for a large buffer Fix strtod.cc undefined constants (InsightSoftwareConsortium#123) When DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS is not defined there is a build error when -Wall -Werror enabled because kMaxExactDoubleIntegerDecimalDigits, exact_powers_of_ten and kExactPowersOfTenSize are used only in else branch of this define (when it's defined). Fixes google/double-conversion#122 Add full license to test .cc files missing it. (InsightSoftwareConsortium#121) Some files in cctest had a 1-line copyright that doesn't list the license. This copies the project license to those files, preserving the date. Add wasm32 as supported platform (InsightSoftwareConsortium#120) Summary: Emscripten is already included, adding wasm32 the same way for when build with "plain" clang wasm32 (without emscripten) Pseiderer/add nios2 and xtensa 001 (InsightSoftwareConsortium#119) * double-conversion: enable for nios2 Nios2 supports double conversion, tested using qemu: Add support for microblaze. Add support for e2k architecture. (InsightSoftwareConsortium#118) Add min exponent width option in double-to-string conversion (InsightSoftwareConsortium#116) Remove reference to `diy-fp.cc` That file was removed in a previous commit. More Bignum fiddling. (InsightSoftwareConsortium#108) * Char has size 1. * More const. * Allow inlining. * Compact Bignum sizes. * Consistent naming. Remove redundant parenthesis. Reported by seanm (github). Optimise Bignum layout. (InsightSoftwareConsortium#107) * Use memset to clear bignum. * Improve data locality. * Reduce size of bignum. Split Strtod() (InsightSoftwareConsortium#106) Add `StrtodTrimmed` method, exposing a later stage of the conversion pipeline. Some tools can do the first stage outside of the double-conversion library and would prefer not to pay the cost of doing it again. Split double-conversion. (InsightSoftwareConsortium#104) Separates the two main classes into separate c and h files. Fix naming. (InsightSoftwareConsortium#103) Fix naming of `case_insensibility` to `case_insensitivity`. Consistent macro prefix. (InsightSoftwareConsortium#101) Use standard min/max. (InsightSoftwareConsortium#102) Fix some issues with invalid hex-float literals. When converting `0x` the converter would assert (or access out of boundary). With `0x1.p1234556666FFFFF` the converter would overflow and not yield the correct exponent. Usefulcat master (InsightSoftwareConsortium#98) * minor bug fix: use free() instead of delete[] to free memory allocated by strdup() * fix for uninitialized variable problem found by valgrind * disable assertions for 'optimize' build * removed -g option that was inadvertently added to CCFLAGS * ignore generated files Fix warning for g++ 4.9.3. CMake: install to correct lib dir (InsightSoftwareConsortium#93) 64-bit libraries should be installed in /usr/lib64, not in /usr/lib/ Make the destination lib dir configurable. Add big endian ARM support (InsightSoftwareConsortium#92) This fixes compilation on such platforms. Switch to relative includes. Fix 16-bit separators. msvc: check if _MSC_VER is defined (InsightSoftwareConsortium#88) Allow for compilation in emscripten (InsightSoftwareConsortium#86) Support emscripten Add test cases. Fixes InsightSoftwareConsortium#62 Add support of ARC architecture (InsightSoftwareConsortium#82) More info about ARC architecture is here: [1] & [2]. We need ARC supported here for many things like: - ICU (see [3]) - Qt5 etc Fix hex literal bug. Large hex literals would lose their minus sign. Support separator characters. Add support for hexadecimal float literals. Fix bug where hex numbers would lose the minus sign. Add comments for achitecture check. This should make it easier to add new architectures. Add support for aarch64_be, or1k and microblazebe. Add support for Windows on ARM and ARM64 (InsightSoftwareConsortium#76) Use `static_assert` with newer compilers. Add Native Client as support architecture. Avoid undefined cast to make ASAN happy. Avoid undefined cast to make ASAN happy. Add `exports_files` Processed length should include no trailing junk (InsightSoftwareConsortium#63) Clarify output charset in DoubleToAscii documentation (InsightSoftwareConsortium#61) * Clarify output charset in DoubleToAscii documentation * Fixing typo in charset docs. Fix warning for code that will never be executed (InsightSoftwareConsortium#59) Rename macros. Renamed DISALLOW_COPY_AND_ASSIGN and DISALLOW_IMPLICIT_CONSTRUCTORS to DC_DISALLOW_COPY_AND_ASSIGN and DC_DISALLOW_IMPLICIT_CONSTRUCTORS. This makes it easier to use this library in projects that have macros with the same name (as is common in Google). Some refactorings: remove unused static, replace deprecated headers, init member in constructor REF: replace deprecated headers REF: meaningless static definition in anonymous namespace REF: init member in constructor Fix typo in variable name. Suppress issue in clang analyzer. CMake fixes. Remove unused CMake file. Implement ALLOW_CASE_INSENSIBILITY mode for StringToDoubleConverter c… Remove unnecessary INSTALL_INTERFACE expression. Use template for CMake installation. Fix mistake for build interface include dir. Improve CMake changes. Update CMake package generation. Implement ALLOW_CASE_INSENSIBILITY mode for StringToDoubleConverter class Add assert and test. Avoid negative shift. When filling in fractional digits in a fixed representation we might use all existing digits. When this happens, we can not look at the next digit to see if we should round up. Before this fix, we tried to shift by a negative amount to see if the (non-existing) next bit was set to 1 (requiring the number to be rounded up).
Fix typos in comments CMakeLists.txt: Export all symbols (InsightSoftwareConsortium#136) test/cctest/CMakeLists.txt: Added /bigobj for MSVC tests (InsightSoftwareConsortium#135) Add DOUBLE_CONVERSION_HAS_ATTRIBUTE to fix warnings on MSVC and enable for GCC. (InsightSoftwareConsortium#131) Fix broken MSVC builds. (InsightSoftwareConsortium#130) Add support for quiet and signaling NaNs to the ieee header. (InsightSoftwareConsortium#128) Move buffer and buffer_pos down (InsightSoftwareConsortium#125) * Move buffer and buffer_pos down Simplifies code by removing two asserts Optimize code with -ftrivial-auto-var-init=pattern by avoiding initialization when buffer is not used * Disable -ftrivial-auto-var-init=pattern for a large buffer Fix strtod.cc undefined constants (InsightSoftwareConsortium#123) When DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS is not defined there is a build error when -Wall -Werror enabled because kMaxExactDoubleIntegerDecimalDigits, exact_powers_of_ten and kExactPowersOfTenSize are used only in else branch of this define (when it's defined). Fixes google/double-conversion#122 Add full license to test .cc files missing it. (InsightSoftwareConsortium#121) Some files in cctest had a 1-line copyright that doesn't list the license. This copies the project license to those files, preserving the date. Add wasm32 as supported platform (InsightSoftwareConsortium#120) Summary: Emscripten is already included, adding wasm32 the same way for when build with "plain" clang wasm32 (without emscripten) Pseiderer/add nios2 and xtensa 001 (InsightSoftwareConsortium#119) * double-conversion: enable for nios2 Nios2 supports double conversion, tested using qemu: Add support for microblaze. Add support for e2k architecture. (InsightSoftwareConsortium#118) Add min exponent width option in double-to-string conversion (InsightSoftwareConsortium#116) Remove reference to `diy-fp.cc` That file was removed in a previous commit. More Bignum fiddling. (InsightSoftwareConsortium#108) * Char has size 1. * More const. * Allow inlining. * Compact Bignum sizes. * Consistent naming. Remove redundant parenthesis. Reported by seanm (github). Optimise Bignum layout. (InsightSoftwareConsortium#107) * Use memset to clear bignum. * Improve data locality. * Reduce size of bignum. Split Strtod() (InsightSoftwareConsortium#106) Add `StrtodTrimmed` method, exposing a later stage of the conversion pipeline. Some tools can do the first stage outside of the double-conversion library and would prefer not to pay the cost of doing it again. Split double-conversion. (InsightSoftwareConsortium#104) Separates the two main classes into separate c and h files. Fix naming. (InsightSoftwareConsortium#103) Fix naming of `case_insensibility` to `case_insensitivity`. Consistent macro prefix. (InsightSoftwareConsortium#101) Use standard min/max. (InsightSoftwareConsortium#102) Fix some issues with invalid hex-float literals. When converting `0x` the converter would assert (or access out of boundary). With `0x1.p1234556666FFFFF` the converter would overflow and not yield the correct exponent. Usefulcat master (InsightSoftwareConsortium#98) * minor bug fix: use free() instead of delete[] to free memory allocated by strdup() * fix for uninitialized variable problem found by valgrind * disable assertions for 'optimize' build * removed -g option that was inadvertently added to CCFLAGS * ignore generated files Fix warning for g++ 4.9.3. CMake: install to correct lib dir (InsightSoftwareConsortium#93) 64-bit libraries should be installed in /usr/lib64, not in /usr/lib/ Make the destination lib dir configurable. Add big endian ARM support (InsightSoftwareConsortium#92) This fixes compilation on such platforms. Switch to relative includes. Fix 16-bit separators. msvc: check if _MSC_VER is defined (InsightSoftwareConsortium#88) Allow for compilation in emscripten (InsightSoftwareConsortium#86) Support emscripten Add test cases. Fixes InsightSoftwareConsortium#62 Add support of ARC architecture (InsightSoftwareConsortium#82) More info about ARC architecture is here: [1] & [2]. We need ARC supported here for many things like: - ICU (see [3]) - Qt5 etc Fix hex literal bug. Large hex literals would lose their minus sign. Support separator characters. Add support for hexadecimal float literals. Fix bug where hex numbers would lose the minus sign. Add comments for achitecture check. This should make it easier to add new architectures. Add support for aarch64_be, or1k and microblazebe. Add support for Windows on ARM and ARM64 (InsightSoftwareConsortium#76) Use `static_assert` with newer compilers. Add Native Client as support architecture. Avoid undefined cast to make ASAN happy. Avoid undefined cast to make ASAN happy. Add `exports_files` Processed length should include no trailing junk (InsightSoftwareConsortium#63) Clarify output charset in DoubleToAscii documentation (InsightSoftwareConsortium#61) * Clarify output charset in DoubleToAscii documentation * Fixing typo in charset docs. Fix warning for code that will never be executed (InsightSoftwareConsortium#59) Rename macros. Renamed DISALLOW_COPY_AND_ASSIGN and DISALLOW_IMPLICIT_CONSTRUCTORS to DC_DISALLOW_COPY_AND_ASSIGN and DC_DISALLOW_IMPLICIT_CONSTRUCTORS. This makes it easier to use this library in projects that have macros with the same name (as is common in Google). Some refactorings: remove unused static, replace deprecated headers, init member in constructor REF: replace deprecated headers REF: meaningless static definition in anonymous namespace REF: init member in constructor Fix typo in variable name. Suppress issue in clang analyzer. CMake fixes. Remove unused CMake file. Implement ALLOW_CASE_INSENSIBILITY mode for StringToDoubleConverter c… Remove unnecessary INSTALL_INTERFACE expression. Use template for CMake installation. Fix mistake for build interface include dir. Improve CMake changes. Update CMake package generation. Implement ALLOW_CASE_INSENSIBILITY mode for StringToDoubleConverter class Add assert and test. Avoid negative shift. When filling in fractional digits in a fixed representation we might use all existing digits. When this happens, we can not look at the next digit to see if we should round up. Before this fix, we tried to shift by a negative amount to see if the (non-existing) next bit was set to 1 (requiring the number to be rounded up).
Fix typos in comments CMakeLists.txt: Export all symbols (#136) test/cctest/CMakeLists.txt: Added /bigobj for MSVC tests (#135) Add DOUBLE_CONVERSION_HAS_ATTRIBUTE to fix warnings on MSVC and enable for GCC. (#131) Fix broken MSVC builds. (#130) Add support for quiet and signaling NaNs to the ieee header. (#128) Move buffer and buffer_pos down (#125) * Move buffer and buffer_pos down Simplifies code by removing two asserts Optimize code with -ftrivial-auto-var-init=pattern by avoiding initialization when buffer is not used * Disable -ftrivial-auto-var-init=pattern for a large buffer Fix strtod.cc undefined constants (#123) When DOUBLE_CONVERSION_CORRECT_DOUBLE_OPERATIONS is not defined there is a build error when -Wall -Werror enabled because kMaxExactDoubleIntegerDecimalDigits, exact_powers_of_ten and kExactPowersOfTenSize are used only in else branch of this define (when it's defined). Fixes google/double-conversion#122 Add full license to test .cc files missing it. (#121) Some files in cctest had a 1-line copyright that doesn't list the license. This copies the project license to those files, preserving the date. Add wasm32 as supported platform (#120) Summary: Emscripten is already included, adding wasm32 the same way for when build with "plain" clang wasm32 (without emscripten) Pseiderer/add nios2 and xtensa 001 (#119) * double-conversion: enable for nios2 Nios2 supports double conversion, tested using qemu: Add support for microblaze. Add support for e2k architecture. (#118) Add min exponent width option in double-to-string conversion (#116) Remove reference to `diy-fp.cc` That file was removed in a previous commit. More Bignum fiddling. (#108) * Char has size 1. * More const. * Allow inlining. * Compact Bignum sizes. * Consistent naming. Remove redundant parenthesis. Reported by seanm (github). Optimise Bignum layout. (#107) * Use memset to clear bignum. * Improve data locality. * Reduce size of bignum. Split Strtod() (#106) Add `StrtodTrimmed` method, exposing a later stage of the conversion pipeline. Some tools can do the first stage outside of the double-conversion library and would prefer not to pay the cost of doing it again. Split double-conversion. (#104) Separates the two main classes into separate c and h files. Fix naming. (#103) Fix naming of `case_insensibility` to `case_insensitivity`. Consistent macro prefix. (#101) Use standard min/max. (#102) Fix some issues with invalid hex-float literals. When converting `0x` the converter would assert (or access out of boundary). With `0x1.p1234556666FFFFF` the converter would overflow and not yield the correct exponent. Usefulcat master (#98) * minor bug fix: use free() instead of delete[] to free memory allocated by strdup() * fix for uninitialized variable problem found by valgrind * disable assertions for 'optimize' build * removed -g option that was inadvertently added to CCFLAGS * ignore generated files Fix warning for g++ 4.9.3. CMake: install to correct lib dir (#93) 64-bit libraries should be installed in /usr/lib64, not in /usr/lib/ Make the destination lib dir configurable. Add big endian ARM support (#92) This fixes compilation on such platforms. Switch to relative includes. Fix 16-bit separators. msvc: check if _MSC_VER is defined (#88) Allow for compilation in emscripten (#86) Support emscripten Add test cases. Fixes #62 Add support of ARC architecture (#82) More info about ARC architecture is here: [1] & [2]. We need ARC supported here for many things like: - ICU (see [3]) - Qt5 etc Fix hex literal bug. Large hex literals would lose their minus sign. Support separator characters. Add support for hexadecimal float literals. Fix bug where hex numbers would lose the minus sign. Add comments for achitecture check. This should make it easier to add new architectures. Add support for aarch64_be, or1k and microblazebe. Add support for Windows on ARM and ARM64 (#76) Use `static_assert` with newer compilers. Add Native Client as support architecture. Avoid undefined cast to make ASAN happy. Avoid undefined cast to make ASAN happy. Add `exports_files` Processed length should include no trailing junk (#63) Clarify output charset in DoubleToAscii documentation (#61) * Clarify output charset in DoubleToAscii documentation * Fixing typo in charset docs. Fix warning for code that will never be executed (#59) Rename macros. Renamed DISALLOW_COPY_AND_ASSIGN and DISALLOW_IMPLICIT_CONSTRUCTORS to DC_DISALLOW_COPY_AND_ASSIGN and DC_DISALLOW_IMPLICIT_CONSTRUCTORS. This makes it easier to use this library in projects that have macros with the same name (as is common in Google). Some refactorings: remove unused static, replace deprecated headers, init member in constructor REF: replace deprecated headers REF: meaningless static definition in anonymous namespace REF: init member in constructor Fix typo in variable name. Suppress issue in clang analyzer. CMake fixes. Remove unused CMake file. Implement ALLOW_CASE_INSENSIBILITY mode for StringToDoubleConverter c… Remove unnecessary INSTALL_INTERFACE expression. Use template for CMake installation. Fix mistake for build interface include dir. Improve CMake changes. Update CMake package generation. Implement ALLOW_CASE_INSENSIBILITY mode for StringToDoubleConverter class Add assert and test. Avoid negative shift. When filling in fractional digits in a fixed representation we might use all existing digits. When this happens, we can not look at the next digit to see if we should round up. Before this fix, we tried to shift by a negative amount to see if the (non-existing) next bit was set to 1 (requiring the number to be rounded up).
Niels suggested the change from ValueType[Dimension] (c-type ValueType*)
to
ValueType(&)[Dimension]
.It is better now doubt, but it generates many breaking changes. That I
do think it could be worth to fix. The main one that is too big to
tackle right now is with all the interface of Cells.
This had to be inherited from VTK, but the interface in ITK could
enjoy a better interface than current raw pointers.
VTK does use c-arrays instead of pointers.
Compare VTK:
https://github.com/Kitware/VTK/blob/a7909e67d7df88dcf81984923296442c7ccaca5b/Common/DataModel/vtkCell.h#L197-L199
With ITK:
ITK/Modules/Core/Common/include/itkCellInterface.h
Lines 320 to 326 in 3a6158a
ENH: Provide constructor from C-array to FixedArray
Also derived classes of FixedArray, inherit constructors from base.
using Superclass::Superclass
This allow to remove some repetition and homogenize the interface.
The only possible breaking change is marking as explicit two FixedArray
converting constructors:
The template conversion is needed to avoid unexpected conversion in
derived classes. Also marking as explicit is in general a good practice.
Users might use static_cast instead of relying in the non-existant
implicit conversion.
ITK_LEGACY_FUTURE_REMOVE was used to switch between the explicit or
implicit constructor in itkVector. The switch is removed, that Vector behavior
is now handled from its base class (FixedArray).
COMP: Fix uninitialized FixedArray and const correctness
This is a false positive, the variables are not used uninitialized, but
we can solve it using the conversion constructor of FixedArray:
FixedArray(Value r[VLenght])
Also add missing const in SetNormal in LineSpatialObject
Fix warning: