Skip to content

Commit

Permalink
Harmonize copyright headers in tutorial folder
Browse files Browse the repository at this point in the history
  • Loading branch information
fspindle committed Sep 11, 2024
1 parent b90c045 commit 3bc7d32
Show file tree
Hide file tree
Showing 30 changed files with 91 additions and 153 deletions.
5 changes: 3 additions & 2 deletions modules/core/include/visp3/core/vpCannyEdgeDetection.h
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ class VISP_EXPORT vpCannyEdgeDetection
* upper threshold.
* \param[in] filteringType : The filtering and gradient operators to apply to the image before the edge detection
* operation.
* \param[in] storeEdgePoints : If true, the list of edge-points will be available using \b vpCannyEdgeDetection::getEdgePointsList .
* \param[in] storeEdgePoints : If true, the list of edge-points will be available using
* \b vpCannyEdgeDetection::getEdgePointsList().
*/
vpCannyEdgeDetection(const int &gaussianKernelSize, const float &gaussianStdev, const unsigned int &sobelAperture,
const float &lowerThreshold = -1.f, const float &upperThreshold = -1.f,
Expand Down Expand Up @@ -261,7 +262,7 @@ class VISP_EXPORT vpCannyEdgeDetection

/**
* \brief If set to true, the list of the detected edge-points will be available
* calling the method \b vpCannyEdgeDetection::getEdgePointsList .
* calling the method \b vpCannyEdgeDetection::getEdgePointsList().
*
* \param[in] storeEdgePoints The new desired status.
*/
Expand Down
6 changes: 3 additions & 3 deletions modules/gui/include/visp3/gui/vpDisplayFactory.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ struct GridSettings
};

inline void makeDisplayGridHelper(std::vector<std::shared_ptr<vpDisplay>> &res, const GridSettings &settings,
unsigned int currRow, unsigned int currCol,
unsigned int currentPixelX, unsigned int currentPixelY,
unsigned int maxRowHeightPixel)
unsigned int currRow, unsigned int currCol,
unsigned int currentPixelX, unsigned int currentPixelY,
unsigned int maxRowHeightPixel)
{
if (currRow != (settings.rows - 1) && (currCol != settings.cols - 1)) {
throw vpException(vpException::dimensionError, "Too few images for the grid size");
Expand Down
6 changes: 2 additions & 4 deletions tutorial/image/tutorial-canny.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

//! \example tutorial-canny.cpp

Expand Down
15 changes: 6 additions & 9 deletions tutorial/ios/AprilTagLiveCamera/VispHelper/ImageConversion.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* This file is part of the ViSP software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
Expand All @@ -41,12 +39,11 @@

@interface ImageConversion : NSObject

+ (vpImage<vpRGBa>)vpImageColorFromUIImage:(UIImage *)image;
+ (vpImage<unsigned char>)vpImageGrayFromUIImage:(UIImage *)image;
+ (UIImage *)UIImageFromVpImageColor:(const vpImage<vpRGBa> &)I;
+ (UIImage *)UIImageFromVpImageGray:(const vpImage<unsigned char> &)I;
+ (vpImage<vpRGBa>)vpImageColorFromUIImage : (UIImage *)image;
+(vpImage<unsigned char>)vpImageGrayFromUIImage:(UIImage *)image;
+(UIImage *)UIImageFromVpImageColor:(const vpImage<vpRGBa> &)I;
+(UIImage *)UIImageFromVpImageGray:(const vpImage<unsigned char> &)I;

@end

#endif

6 changes: 2 additions & 4 deletions tutorial/ios/AprilTagLiveCamera/VispHelper/ImageConversion.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* This file is part of the ViSP software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down
13 changes: 5 additions & 8 deletions tutorial/ios/AprilTagLiveCamera/VispHelper/ImageDisplay.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* This file is part of the ViSP software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import <UIKit/UIKit.h>
#ifdef __cplusplus
Expand All @@ -41,11 +39,10 @@

@interface ImageDisplay : NSObject

+ (UIImage *)displayLine:(UIImage *)image :(vpImagePoint &)ip1 :(vpImagePoint &)ip2 :(UIColor*)color :(int)tickness;
+ (UIImage *)displayFrame:(UIImage *)image :(const vpHomogeneousMatrix &)cMo :(const vpCameraParameters &)cam
:(double) size :(int)tickness;
+ (UIImage *)displayLine : (UIImage *)image : (vpImagePoint &)ip1 : (vpImagePoint &)ip2 : (UIColor *)color : (int)tickness;
+(UIImage *)displayFrame:(UIImage *)image : (const vpHomogeneousMatrix &)cMo : (const vpCameraParameters &)cam
: (double)size : (int)tickness;

@end

#endif

7 changes: 2 additions & 5 deletions tutorial/ios/AprilTagLiveCamera/VispHelper/ImageDisplay.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down Expand Up @@ -137,4 +135,3 @@ + (UIImage *)displayFrame:(UIImage *)image :(const vpHomogeneousMatrix &)cMo :(c
@end

#endif

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* This file is part of the ViSP software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import <UIKit/UIKit.h>
#ifdef __cplusplus
Expand All @@ -39,13 +37,13 @@

NS_ASSUME_NONnullptr_BEGIN

@interface ImageDisplay (withContext)
@interface ImageDisplay(withContext)

+ (void)displayLineWithContext:(CGContextRef)context :(std::vector<vpImagePoint>)polygon :(UIColor*)color :(int)tickness;
+ (void)displayLineWithContext :(CGContextRef)context : (std::vector<vpImagePoint>)polygon : (UIColor *)color : (int)tickness;

+ (void)displayFrameWithContext:(CGContextRef)context :(const vpHomogeneousMatrix &)cMo :(const vpCameraParameters &)cam :(double) size :(int)tickness;
+(void)displayFrameWithContext:(CGContextRef)context : (const vpHomogeneousMatrix &)cMo : (const vpCameraParameters &)cam : (double)size : (int)tickness;

+ (void)displayText:(NSString*)text :(double)x :(double)y :(int)width :(int)height :(UIColor*)color :(UIColor*)bgColor;
+(void)displayText:(NSString *)text : (double)x : (double)y : (int)width : (int)height : (UIColor *)color : (UIColor *)bgColor;

@end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* This file is part of the ViSP software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import "ImageDisplayWithContext.h"

Expand Down
7 changes: 2 additions & 5 deletions tutorial/ios/GettingStarted/GettingStarted/ViewController.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down Expand Up @@ -113,4 +111,3 @@ - (void)didReceiveMemoryWarning {
@end

#endif

15 changes: 6 additions & 9 deletions tutorial/ios/StartedAprilTag/StartedAprilTag/ImageConversion.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
Expand All @@ -41,12 +39,11 @@

@interface ImageConversion : NSObject

+ (vpImage<vpRGBa>)vpImageColorFromUIImage:(UIImage *)image;
+ (vpImage<unsigned char>)vpImageGrayFromUIImage:(UIImage *)image;
+ (UIImage *)UIImageFromVpImageColor:(const vpImage<vpRGBa> &)I;
+ (UIImage *)UIImageFromVpImageGray:(const vpImage<unsigned char> &)I;
+ (vpImage<vpRGBa>)vpImageColorFromUIImage : (UIImage *)image;
+(vpImage<unsigned char>)vpImageGrayFromUIImage:(UIImage *)image;
+(UIImage *)UIImageFromVpImageColor:(const vpImage<vpRGBa> &)I;
+(UIImage *)UIImageFromVpImageGray:(const vpImage<unsigned char> &)I;

@end

#endif

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down
13 changes: 5 additions & 8 deletions tutorial/ios/StartedAprilTag/StartedAprilTag/ImageDisplay.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import <UIKit/UIKit.h>
#ifdef __cplusplus
Expand All @@ -39,11 +37,10 @@

@interface ImageDisplay : NSObject

+ (UIImage *)displayLine:(UIImage *)image :(vpImagePoint &)ip1 :(vpImagePoint &)ip2 :(UIColor*)color :(int)tickness;
+ (UIImage *)displayFrame:(UIImage *)image :(const vpHomogeneousMatrix &)cMo :(const vpCameraParameters &)cam
:(double) size :(int)tickness;
+ (UIImage *)displayLine : (UIImage *)image : (vpImagePoint &)ip1 : (vpImagePoint &)ip2 : (UIColor *)color : (int)tickness;
+(UIImage *)displayFrame:(UIImage *)image : (const vpHomogeneousMatrix &)cMo : (const vpCameraParameters &)cam
: (double)size : (int)tickness;

@end

#endif

7 changes: 2 additions & 5 deletions tutorial/ios/StartedAprilTag/StartedAprilTag/ImageDisplay.mm
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down Expand Up @@ -137,4 +135,3 @@ + (UIImage *)displayFrame:(UIImage *)image :(const vpHomogeneousMatrix &)cMo :(c
@end

#endif

15 changes: 6 additions & 9 deletions tutorial/ios/StartedImageProc/StartedImageProc/ImageConversion.h
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#import <Foundation/Foundation.h>
#import <UIKit/UIKit.h>
Expand All @@ -41,12 +39,11 @@

@interface ImageConversion : NSObject

+ (vpImage<vpRGBa>)vpImageColorFromUIImage:(UIImage *)image;
+ (vpImage<unsigned char>)vpImageGrayFromUIImage:(UIImage *)image;
+ (UIImage *)UIImageFromVpImageColor:(const vpImage<vpRGBa> &)I;
+ (UIImage *)UIImageFromVpImageGray:(const vpImage<unsigned char> &)I;
+ (vpImage<vpRGBa>)vpImageColorFromUIImage : (UIImage *)image;
+(vpImage<unsigned char>)vpImageGrayFromUIImage:(UIImage *)image;
+(UIImage *)UIImageFromVpImageColor:(const vpImage<vpRGBa> &)I;
+(UIImage *)UIImageFromVpImageGray:(const vpImage<unsigned char> &)I;

@end

#endif

Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/****************************************************************************
*
/*
* ViSP, open source Visual Servoing Platform software.
* Copyright (C) 2005 - 2023 by Inria. All rights reserved.
*
Expand Down Expand Up @@ -27,8 +26,7 @@
*
* This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
* WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
*
*****************************************************************************/
*/

#ifndef DOXYGEN_SHOULD_SKIP_THIS

Expand Down
Loading

0 comments on commit 3bc7d32

Please sign in to comment.