diff options
Diffstat (limited to '2.3-1/src/c')
107 files changed, 872 insertions, 266 deletions
diff --git a/2.3-1/src/c/differential_calculus/diff/u16diffca.c b/2.3-1/src/c/differential_calculus/diff/u16diffca.c new file mode 100644 index 00000000..d83a9e6e --- /dev/null +++ b/2.3-1/src/c/differential_calculus/diff/u16diffca.c @@ -0,0 +1,203 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + /* This function calculates difference between adjacent members of given + input array/matrix */ + +#include "diffc.h" + + +void u16diffca(uint16 *in, int row, int col, int depth, int dim, uint16 *out) +{ + int counter, depth_count; + int row_count, col_count; + uint16 *buffer; /*To store intermediate results*/ + + depth_count = 1; + + if(dim == 0) + { /*For dim = 0, we calculate difference between adjacent elements + in case of arrays. In case of matrices, we calculate difference along + first column, and then continue to second (diff between first element + of second column and last element of first column, then third etc.*/ + if(depth == 1) + {/*for depth=1, a buffer is not needed. Directly write result in + out buffer*/ + for(counter = 0; counter < row*col - depth_count; counter++) + { + out[counter] = in[counter+1] - in[counter]; + } + } + else + { /*define buffer for storing intermediate results*/ + + buffer = (uint16 *) malloc (sizeof(uint16)*(row*col-1)); + + while(depth_count <= depth) + { + if(depth_count == 1) + { + /*calculate diff and store in buffer*/ + for(counter = 0; counter < row*col - depth_count; counter++) + { + buffer[counter] = in[counter+1] - in[counter]; + } + } + else if(depth_count < depth) + { + for(counter = 0; counter <= row*col - depth_count ; counter++) + { + buffer[counter] = buffer[counter+1] - buffer[counter]; + } + } + /*For last step use output buffer to store result*/ + else + { + for(counter = 0; counter < row*col - depth_count; counter++) + { + out[counter] = buffer[counter+1] - buffer[counter]; + } + } + depth_count += 1; + } + } + + } + else if(dim == 1) + { + /*For dim = 1, difference is calculated along rows. Each element of + first row is subtracted from corresponding element of second row and + result is stored in first row. Same thing is repeated till last row. */ + + if (depth == 1) + { + /*If depth is 1, store result directly in out buffer*/ + for(col_count = 0; col_count < col; col_count++) + { + for(row_count = 0; row_count < row - 1; row_count++) + { + out[col_count*(row-1)+row_count] = in[col_count*row + row_count+1] \ + - in[col_count*row + row_count]; + } + } + } + else + { + /*If depth is not 1, declare a buffer to store intermediate + results. At last step store result into out buffer*/ + buffer = (uint16 *) malloc (sizeof(uint16)*((row-1)*col)); + + while(depth_count <= depth) + { + if(depth_count == 1) + { + /*For first step, use in buffer and store results in buffer*/ + for(col_count = 0; col_count < col; col_count++) + { + for(row_count = 0; row_count < row - 1; row_count++) + { + buffer[col_count*row+row_count] = in[col_count*row + row_count + 1] \ + - in[col_count*row + row_count]; + } + + } + } + else if(depth_count < depth) + { + for(col_count = 0; col_count < col; col_count++) + { + for(row_count = 0; row_count < row - depth_count; row_count++) + { + buffer[col_count*row+row_count] = buffer[col_count*row + row_count + 1] \ + - buffer[col_count*row + row_count]; + } + + } + } + else + { + for(col_count = 0; col_count < col; col_count++) + { + for(row_count = 0; row_count < row - depth_count; row_count++) + { + out[col_count*(row-depth_count)+row_count] = buffer[col_count*row + row_count+1] \ + - buffer[col_count*row + row_count]; + } + } + } + depth_count +=1; + } + } + } + else if(dim == 2) + { + /*For dim = 2, difference is calculated along columns. Each element of + first column is subtracted from corresponding element of second column + and result is stored in first column. Same thing is repeated till last + column. */ + if(depth == 1) + { + for(row_count = 0; row_count < row; row_count++) + { + for(col_count = 0; col_count < col - 1; col_count++) + { + out[col_count*row+row_count] = in[(col_count+1)*row + row_count] \ + - in[col_count*row + row_count]; + } + } + } + else + { + /*If depth is not 1, declare a buffer to store intermediate + results. At last step store result into out buffer*/ + buffer = (uint16 *) malloc (sizeof(uint16)*(row*(col-1))); + + while(depth_count <= depth) + { + if(depth_count == 1) + { + for(row_count = 0; row_count < row; row_count++) + { + for(col_count = 0; col_count < col - 1; col_count++) + { + buffer[col_count*row+row_count] = in[(col_count+1)*row + row_count] \ + - in[col_count*row + row_count]; + } + } + } + else if(depth_count < depth) + { + for(row_count = 0; row_count < row; row_count++) + { + for(col_count = 0; col_count < col - depth_count; col_count++) + { + buffer[col_count*row+row_count] = buffer[(col_count+1)*row + row_count] \ + - buffer[col_count*row + row_count]; + } + } + } + else + { + for(row_count = 0; row_count < row; row_count++) + { + for(col_count = 0; col_count < col - depth_count; col_count++) + { + out[col_count*row+row_count] = buffer[(col_count+1)*row + row_count] \ + - buffer[col_count*row + row_count]; + } + } + } + depth_count += 1; + } + } + } +} diff --git a/2.3-1/src/c/differential_calculus/includes/diffc.h b/2.3-1/src/c/differential_calculus/includes/diffc.h index 7d266f1e..2e2cf018 100644 --- a/2.3-1/src/c/differential_calculus/includes/diffc.h +++ b/2.3-1/src/c/differential_calculus/includes/diffc.h @@ -13,6 +13,8 @@ #define __DIFFC_H__ #include "types.h" +#include <stdio.h> +#include <stdlib.h> #ifdef __cplusplus extern "C" { diff --git a/2.3-1/src/c/elementaryFunctions/bitset/u16bitsets.c b/2.3-1/src/c/elementaryFunctions/bitset/u16bitsets.c index 953e46c9..ff72be3f 100644 --- a/2.3-1/src/c/elementaryFunctions/bitset/u16bitsets.c +++ b/2.3-1/src/c/elementaryFunctions/bitset/u16bitsets.c @@ -7,12 +7,12 @@ uint16 u16bitsets(uint16 value,int position,int bit_value) { if(bit_value==1) { - unsigned char mask1 = 1 << (position-1) ; // we could cast to unsigned char, just to be safe + unsigned char mask1 = 1 << (position-1) ; /* we could cast to unsigned char, just to be safe */ return (mask1 | value); } else { - unsigned char mask2 = ~(1 << (position-1)); // we could cast to unsigned char, just to be safe + unsigned char mask2 = ~(1 << (position-1)); /*we could cast to unsigned char, just to be safe*/ return (mask2 & value); } diff --git a/2.3-1/src/c/elementaryFunctions/bitset/u8bitsets.c b/2.3-1/src/c/elementaryFunctions/bitset/u8bitsets.c index 5f44dcd8..b97a1575 100644 --- a/2.3-1/src/c/elementaryFunctions/bitset/u8bitsets.c +++ b/2.3-1/src/c/elementaryFunctions/bitset/u8bitsets.c @@ -7,12 +7,12 @@ uint8 u8bitsets(uint8 value,int position,int bit_value) { if(bit_value==1) { - unsigned char mask1 = 1 << (position-1) ; // we could cast to unsigned char, just to be safe + unsigned char mask1 = 1 << (position-1) ; /* we could cast to unsigned char, just to be safe */ return (mask1 | value); } else { - unsigned char mask2 = ~(1 << (position-1)); // we could cast to unsigned char, just to be safe + unsigned char mask2 = ~(1 << (position-1)); /* we could cast to unsigned char, just to be safe */ return (mask2 & value); } diff --git a/2.3-1/src/c/elementaryFunctions/includes/fix.h b/2.3-1/src/c/elementaryFunctions/includes/fix.h index d3e7f88b..592905b4 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/fix.h +++ b/2.3-1/src/c/elementaryFunctions/includes/fix.h @@ -17,6 +17,9 @@ #include "floatComplex.h" #include "doubleComplex.h" #include "types.h" +#include "floor.h" +#include "ceil.h" + #ifdef __cplusplus extern "C" { diff --git a/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c b/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c index f67968d6..d2ca6987 100644 --- a/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c +++ b/2.3-1/src/c/elementaryFunctions/linspace/dlinspacea.c @@ -7,7 +7,7 @@ void dlinspacea(double *low_limit,int _row,double *up_limit,double range_num,dou { int i,j,k; double temp; - float step_iterate[_row]; // for each row the spacing between two values is different. + float step_iterate[_row]; /* for each row the spacing between two values is different.*/ for(i=0;i<_row;i++) { @@ -16,7 +16,7 @@ void dlinspacea(double *low_limit,int _row,double *up_limit,double range_num,dou } for(j=0;j < _row;j++) { - out[j] = low_limit[j]; // For every row first element is the first value of low_limit array + out[j] = low_limit[j]; /* For every row first element is the first value of low_limit array*/ temp = low_limit[j]; for(k=1;k < (double)range_num;k++ ) { @@ -24,7 +24,7 @@ void dlinspacea(double *low_limit,int _row,double *up_limit,double range_num,dou temp = out[(_row*k)+j]; if(k == (double)range_num-1 ) { - out[(_row*k)+j] = (double)up_limit[j]; // Last value of output is equal to first value of up_limit array + out[(_row*k)+j] = (double)up_limit[j]; /* Last value of output is equal to first value of up_limit array*/ } } diff --git a/2.3-1/src/c/elementaryFunctions/linspace/dlinspaces.c b/2.3-1/src/c/elementaryFunctions/linspace/dlinspaces.c index 82b88e34..daeb8257 100644 --- a/2.3-1/src/c/elementaryFunctions/linspace/dlinspaces.c +++ b/2.3-1/src/c/elementaryFunctions/linspace/dlinspaces.c @@ -8,14 +8,14 @@ void dlinspaces(double low_limit,double up_limit,double range_num,double *out) int j; double temp = low_limit; float step_iterate = (up_limit-low_limit)/(range_num-1); - out[0] = low_limit; //First value of output is equal to low_limit value + out[0] = low_limit; /*First value of output is equal to low_limit value*/ for(j=1; j<(double)range_num; j++) { out[j] = temp + step_iterate; temp = out[j]; if(j == (double)range_num-1 ) { - out[j] = (double)up_limit; // Last value of output is equal to up_limit value + out[j] = (double)up_limit; /* Last value of output is equal to up_limit value*/ } } diff --git a/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c b/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c index f8b283c6..9ea551bd 100644 --- a/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c +++ b/2.3-1/src/c/elementaryFunctions/logspace/dlogspacea.c @@ -8,7 +8,7 @@ void dlogspacea(double *low_limit,int _row,double *up_limit,double range_num,dou { int i,j,k; double temp; - double step_iterate[_row]; // for each row the spacing between two values is different. + double step_iterate[_row]; /* for each row the spacing between two values is different.*/ for(i=0;i<_row;i++) { step_iterate[i] = pow(10,((up_limit[i]-low_limit[i])/(range_num-1))); @@ -17,7 +17,7 @@ void dlogspacea(double *low_limit,int _row,double *up_limit,double range_num,dou } for(j=0;j < _row;j++) { - out[j] = pow(10,low_limit[j]); // For every row first element is equal to 10 raise to the first value of low_limit array + out[j] = pow(10,low_limit[j]); /* For every row first element is equal to 10 raise to the first value of low_limit array*/ temp = out[j]; for(k=1;k < (double)range_num;k++ ) { @@ -25,7 +25,7 @@ void dlogspacea(double *low_limit,int _row,double *up_limit,double range_num,dou temp = out[(_row*k)+j]; if(k == (double)range_num-1 ) { - out[(_row*k)+j] = pow(10,((double)up_limit[j])); // For every row Last value of output is equal to 10 raise to first value of up_limit array + out[(_row*k)+j] = pow(10,((double)up_limit[j])); /* For every row Last value of output is equal to 10 raise to first value of up_limit array*/ } } diff --git a/2.3-1/src/c/elementaryFunctions/logspace/dlogspaces.c b/2.3-1/src/c/elementaryFunctions/logspace/dlogspaces.c index 7970321b..851713b0 100644 --- a/2.3-1/src/c/elementaryFunctions/logspace/dlogspaces.c +++ b/2.3-1/src/c/elementaryFunctions/logspace/dlogspaces.c @@ -9,14 +9,14 @@ void dlogspaces(double low_limit,double up_limit,double range_num,double *out) int j; double temp = pow(10,low_limit); double step_iterate = pow(10,((up_limit-low_limit)/(range_num-1))); - out[0] = pow(10,low_limit); //First value of output is equal to low_limit value + out[0] = pow(10,low_limit); /*First value of output is equal to low_limit value*/ for(j=1; j<(double)range_num; j++) { out[j] = temp*step_iterate; temp = out[j]; if(j == (double)range_num-1 ) { - out[j] = pow(10,((double)up_limit)); // Last value of output is equal to up_limit value + out[j] = pow(10,((double)up_limit)); /* Last value of output is equal to up_limit value*/ } } diff --git a/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c b/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c index 425fc979..6e398a17 100644 --- a/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c +++ b/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c @@ -16,7 +16,7 @@ #include "RPIPeripheralPinISR.h" #include "RPIPeripheralDigital.h" -int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)) +int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void)) { int status; status = wiringPiISR((int)phy_pin[pin-1], (int) edgetype, ISRFunction); diff --git a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c index d40263f2..a5f80e5d 100644 --- a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c +++ b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c @@ -19,8 +19,10 @@ /*pin is reduced by one as array index starts from 0 and pin no starts from 1*/ uint8 u8RPIDigitalOuts(uint8 pin, uint8 state) { - if (state == 0) //low output + if (state == 0) /*low output*/ digitalWrite(phy_pin[pin-1], LOW); - if (state == 1) //high output + if (state == 1) /*high output*/ digitalWrite(phy_pin[pin-1], HIGH); + + return 0; } diff --git a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c index 163f0c87..37cfc037 100644 --- a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c +++ b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c @@ -28,14 +28,13 @@ int phy_pin[] = {17, 17, 8, 17, 9, 17, 7, 15, 17, 16, /*Pin 1 to 10*/ /*pin is reduced by one as arrayiindex starts from 0 and pin no starts from 1*/ uint8 u8RPIDigitalSetups(uint8 pin, uint8 direction) { - if(direction == 1) //Pin to be used as output - { - pinMode(phy_pin[pin-1], OUTPUT); - } + if(direction == 1) /*Pin to be used as output*/ + pinMode(phy_pin[pin-1], OUTPUT); + else if(direction == 2) + pinMode(phy_pin[pin-1], PWM_OUTPUT); else - { pinMode(phy_pin[pin-1], INPUT); - } + return 0; } diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h new file mode 100644 index 00000000..47634d05 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h @@ -0,0 +1,31 @@ + /* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __RPIPERIPHERALPWM_H__ +#define __RPIPERIPHERALPWM_H__ + +#include "types.h" +#include "wiringPi.h" + +#ifdef __cplusplus +extern "C" { +#endif + +uint8 u8RPIHardPWMWrites(uint8 pin, uint16 value); +uint8 u8RPIHardPWMSetRanges(uint16 value); +uint8 u8RPIHardPWMSetModes(uint8 mode); +uint8 u8RPIHardPWMSetClocks(uint16 clk_divisor); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__RPIPERIPHERALPWM_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h index de05f908..fc5a8d04 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h @@ -17,7 +17,7 @@ extern "C" { #endif -int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)); +int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void)); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h index 4c5d3a55..23045677 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h @@ -19,7 +19,7 @@ extern "C" { #endif -uint16 RPIThreadCreate(void (*threadFunction)); +uint16 RPIThreadCreate(void *(*threadFunction)(void)); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h new file mode 100644 index 00000000..8c8f4c62 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h @@ -0,0 +1,30 @@ + /* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __INT_RPIPERIPHERALPWM_H__ +#define __INT_RPIPERIPHERALPWM_H__ + +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define RPI_HardPWMWrite(pin,value) u8RPIHardPWMWrites((uint8)pin,(uint16)value) +#define RPI_HardPWMSetRange(value) u8RPIHardPWMSetRanges((uint16)value) +#define RPI_HardPWMSetMode(mode) u8RPIHardPWMSetModes((uint8)mode) +#define RPI_HardPWMSetClock(clk_divisor) u8RPIHardPWMSetClocks((uint16)clk_divisor) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_RPIPERIPHERALPWM_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/libraries/wiringPi/wiringPi.h b/2.3-1/src/c/hardware/rasberrypi/libraries/wiringPi/wiringPi.h index e11a0bef..a5eea873 100644 --- a/2.3-1/src/c/hardware/rasberrypi/libraries/wiringPi/wiringPi.h +++ b/2.3-1/src/c/hardware/rasberrypi/libraries/wiringPi/wiringPi.h @@ -24,17 +24,17 @@ #ifndef __WIRING_PI_H__ #define __WIRING_PI_H__ -// C doesn't have true/false by default and I can never remember which -// way round they are, so ... - +/* C doesn't have true/false by default and I can never remember which + way round they are, so ... +*/ #ifndef TRUE # define TRUE (1==1) # define FALSE (!TRUE) #endif -// Handy defines +/* Handy defines*/ -// wiringPi modes +/* wiringPi modes*/ #define WPI_MODE_PINS 0 #define WPI_MODE_GPIO 1 @@ -43,7 +43,7 @@ #define WPI_MODE_PIFACE 4 #define WPI_MODE_UNINITIALISED -1 -// Pin modes +/* Pin modes*/ #define INPUT 0 #define OUTPUT 1 @@ -56,27 +56,27 @@ #define LOW 0 #define HIGH 1 -// Pull up/down/none +/* Pull up/down/none*/ #define PUD_OFF 0 #define PUD_DOWN 1 #define PUD_UP 2 -// PWM +/* PWM*/ #define PWM_MODE_MS 0 #define PWM_MODE_BAL 1 -// Interrupt levels +/*Interrupt levels*/ #define INT_EDGE_SETUP 0 #define INT_EDGE_FALLING 1 #define INT_EDGE_RISING 2 #define INT_EDGE_BOTH 3 -// Pi model types and version numbers -// Intended for the GPIO program Use at your own risk. - +/*Pi model types and version numbers + Intended for the GPIO program Use at your own risk. +*/ #define PI_MODEL_A 0 #define PI_MODEL_B 1 #define PI_MODEL_AP 2 @@ -104,36 +104,36 @@ extern const char *piMakerNames [16] ; extern const int piMemorySize [ 8] ; -// Intended for the GPIO program Use at your own risk. +/* Intended for the GPIO program Use at your own risk.*/ -// Threads +/* Threads*/ #define PI_THREAD(X) void *X (void *dummy) -// Failure modes +/* Failure modes*/ #define WPI_FATAL (1==1) #define WPI_ALMOST (1==2) -// wiringPiNodeStruct: -// This describes additional device nodes in the extended wiringPi -// 2.0 scheme of things. -// It's a simple linked list for now, but will hopefully migrate to -// a binary tree for efficiency reasons - but then again, the chances -// of more than 1 or 2 devices being added are fairly slim, so who -// knows.... - +/*wiringPiNodeStruct: + This describes additional device nodes in the extended wiringPi + 2.0 scheme of things. + It's a simple linked list for now, but will hopefully migrate to + a binary tree for efficiency reasons - but then again, the chances + of more than 1 or 2 devices being added are fairly slim, so who + knows.... +*/ struct wiringPiNodeStruct { int pinBase ; int pinMax ; - int fd ; // Node specific - unsigned int data0 ; // ditto - unsigned int data1 ; // ditto - unsigned int data2 ; // ditto - unsigned int data3 ; // ditto + int fd ; /* Node specific*/ + unsigned int data0 ; /* ditto*/ + unsigned int data1 ; /* ditto*/ + unsigned int data2 ; /* ditto*/ + unsigned int data3 ; /* ditto*/ void (*pinMode) (struct wiringPiNodeStruct *node, int pin, int mode) ; void (*pullUpDnControl) (struct wiringPiNodeStruct *node, int pin, int mode) ; @@ -149,21 +149,21 @@ struct wiringPiNodeStruct extern struct wiringPiNodeStruct *wiringPiNodes ; -// Function prototypes -// c++ wrappers thanks to a comment by Nick Lott -// (and others on the Raspberry Pi forums) - +/*Function prototypes + c++ wrappers thanks to a comment by Nick Lott + (and others on the Raspberry Pi forums) +*/ #ifdef __cplusplus extern "C" { #endif -// Data +/* Data*/ -// Internal +/* Internal*/ extern int wiringPiFailure (int fatal, const char *message, ...) ; -// Core wiringPi functions +/* Core wiringPi functions*/ extern struct wiringPiNodeStruct *wiringPiFindNode (int pin) ; extern struct wiringPiNodeStruct *wiringPiNewNode (int pinBase, int numPins) ; @@ -182,13 +182,13 @@ extern void pwmWrite (int pin, int value) ; extern int analogRead (int pin) ; extern void analogWrite (int pin, int value) ; -// PiFace specifics -// (Deprecated) +/* PiFace specifics + (Deprecated)*/ extern int wiringPiSetupPiFace (void) ; -extern int wiringPiSetupPiFaceForGpioProg (void) ; // Don't use this - for gpio program only +extern int wiringPiSetupPiFaceForGpioProg (void) ; /* Don't use this - for gpio program only*/ -// On-Board Raspberry Pi hardware specific stuff +/* On-Board Raspberry Pi hardware specific stuff*/ extern int piBoardRev (void) ; extern void piBoardId (int *model, int *rev, int *mem, int *maker, int *overVolted) ; @@ -204,23 +204,23 @@ extern void pwmSetRange (unsigned int range) ; extern void pwmSetClock (int divisor) ; extern void gpioClockSet (int pin, int freq) ; -// Interrupts -// (Also Pi hardware specific) +/* Interrupts + (Also Pi hardware specific)*/ extern int waitForInterrupt (int pin, int mS) ; extern int wiringPiISR (int pin, int mode, void (*function)(void)) ; -// Threads +/* Threads*/ extern int piThreadCreate (void *(*fn)(void *)) ; extern void piLock (int key) ; extern void piUnlock (int key) ; -// Schedulling priority +/* Schedulling priority*/ extern int piHiPri (const int pri) ; -// Extras from arduino land +/* Extras from arduino land*/ extern void delay (unsigned int howLong) ; extern void delayMicroseconds (unsigned int howLong) ; diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c new file mode 100644 index 00000000..883f3faf --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c @@ -0,0 +1,27 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function to set clock for pwm channel. Default clock is 19.2 MHz. 'clk_divisor' + along with range decides frequency for PWM + PWM frequency = 19.2 MHz / clk_divisor/ range + Range for clk_divisor = 1-2048 + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" + +uint8 u8RPIHardPWMSetClocks(uint16 clk_divisor) +{ + pwmSetClock(clk_divisor); + + return 0; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c new file mode 100644 index 00000000..5a7ccd15 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c @@ -0,0 +1,28 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function to set mode for PWM channel. Two modes are available + 0 --> balanced mode + 1 --> mark/space mode + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" + +uint8 u8RPIHardPWMSetModes(uint8 mode) +{ + if (mode == 1) /*mark/space mode*/ + pwmSetMode(PWM_MODE_MS); + else + pwmSetMode(PWM_MODE_BAL); + return 0; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c new file mode 100644 index 00000000..e3cda77e --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function to assigne pwm duty to specified pin. PWM duty is decided by 'value' + and 'range' specified using corresponding function. + PWM duty = value/range + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" + +uint8 u8RPIHardPWMSetRanges(uint16 value) +{ + pwmSetRange(value); + return 0; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c new file mode 100644 index 00000000..546cfd5f --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c @@ -0,0 +1,26 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function to set range for pwm channel. PWM duty is decided by 'range' + and 'value' specified using corresponding function. + PWM duty = value/range + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" +#include "RPIPeripheralDigital.h" + +uint8 u8RPIHardPWMWrites(uint8 pin, uint16 value) +{ + pwmWrite((int)phy_pin[pin-1], value); + return 0; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c index 163e9c7d..c1553f79 100644 --- a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c @@ -28,7 +28,7 @@ uint8 dRPISerialSendDatas(int fd, double data) for(count=0; count<sizeof(double); count++) { - //Send lsb first + /*Send lsb first*/ serialPutchar(fd, (uint8) in_data.bytes[count]); } diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c index 861d7d89..ff6edfff 100644 --- a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c @@ -17,7 +17,7 @@ uint8 i16RPISerialSendDatas(int fd, int16 data) { - //Send lsb first + /*Send lsb first*/ serialPutchar(fd, (uint8) data); serialPutchar(fd, (uint8) (data>>8)); diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c index a8c34d0e..bd0cd949 100644 --- a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c @@ -27,7 +27,7 @@ uint8 sRPISerialSendDatas(int fd, float data) for(count=0; count<sizeof(float); count++) { - //Send lsb first + /*Send lsb first*/ serialPutchar(fd, (uint8) in_data.bytes[count]); } diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c index 5b2d0568..2f0536c3 100644 --- a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c @@ -17,7 +17,7 @@ uint8 u16RPISerialSendDatas(int fd, uint16 data) { - //Send lsb first + /*Send lsb first*/ serialPutchar(fd, (uint8) data); serialPutchar(fd, (uint8) (data>>8)); diff --git a/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c b/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c index d94beff4..d0a063ac 100644 --- a/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c +++ b/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c @@ -15,7 +15,7 @@ #include "types.h" #include "RPIPeripheralThreading.h" -uint16 RPIThreadCreate(void (*threadFunction)) +uint16 RPIThreadCreate(void *(*threadFunction)(void)) { int status; status = piThreadCreate (threadFunction); diff --git a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c index 48418c09..fe756c96 100644 --- a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c +++ b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c @@ -18,5 +18,6 @@ uint8 u16RPIDelayMicros(uint16 time) { delayMicroseconds(time); + return 0; } diff --git a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c index 2dc59bbf..d7be3f88 100644 --- a/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c +++ b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c @@ -20,6 +20,6 @@ uint8 u16RPIDelayMillis(uint16 time) { delay(time); - + return 0; } diff --git a/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.c b/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.c new file mode 100644 index 00000000..a7eeaec2 --- /dev/null +++ b/2.3-1/src/c/imageProcessing/cvcore/imcvCreateImages.c @@ -0,0 +1,39 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to create openCV image object from given specifications*/ + +#include "types.h" +#include "cvcore.h" +#include <stdio.h> + +IplImage* imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch) +{ + CvSize imageSize = cvSize (width,height); + IplImage *img = NULL; + if (strcmp(bit_depth,"IPL_DEPTH_1U") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_1U,no_of_ch); + else if (strcmp(bit_depth,"IPL_DEPTH_8U") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch); + else if (strcmp(bit_depth,"IPL_DEPTH_8S") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch); + else if (strcmp(bit_depth,"IPL_DEPTH_16U") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch); + else if (strcmp(bit_depth,"IPL_DEPTH_16S") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch); + else if (strcmp(bit_depth,"IPL_DEPTH_32U") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_8U,no_of_ch); + else if (strcmp(bit_depth,"IPL_DEPTH_32S") == 0) + img = cvCreateImage(imageSize,IPL_DEPTH_8S,no_of_ch); + + return img; +}
\ No newline at end of file diff --git a/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.c b/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.c new file mode 100644 index 00000000..7c843f94 --- /dev/null +++ b/2.3-1/src/c/imageProcessing/cvhighgui/imcvLoadImages.c @@ -0,0 +1,23 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to load image object from given filename*/ + +#include "types.h" +#include "cvcore.h" +#include "cvhighgui.h" +#include <stdio.h> + +IplImage* imcvLoadImages(char *filename, uint8 opentype) +{ + return (cvLoadImage(filename,opentype)); +}
\ No newline at end of file diff --git a/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.c b/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.c new file mode 100644 index 00000000..82ae3ee3 --- /dev/null +++ b/2.3-1/src/c/imageProcessing/cvhighgui/imcvShowImages.c @@ -0,0 +1,25 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to create show an image */ + +#include "types.h" +#include "cvcore.h" +#include "cvhighgui.h" +#include <stdio.h> + +uint8 imcvShowImages(char *winname, IplImage* img) +{ + cvShowImage(winname,img); + + return (0); +}
\ No newline at end of file diff --git a/2.3-1/src/c/imageProcessing/includes/core.h b/2.3-1/src/c/imageProcessing/includes/core.h new file mode 100644 index 00000000..1e4c83cb --- /dev/null +++ b/2.3-1/src/c/imageProcessing/includes/core.h @@ -0,0 +1,11 @@ + /* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ diff --git a/2.3-1/src/c/imageProcessing/includes/cvcore.h b/2.3-1/src/c/imageProcessing/includes/cvcore.h new file mode 100644 index 00000000..317d99b6 --- /dev/null +++ b/2.3-1/src/c/imageProcessing/includes/cvcore.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __CVCORE_H__ +#define __CVCORE_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include "types.h" +#include "opencv2/core/core.hpp" + +IplImage* imcvCreateImages(int width, int height, char *bit_depth, uint8 no_of_ch); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__CVCORE_H__*/ diff --git a/2.3-1/src/c/imageProcessing/includes/cvhighgui.h b/2.3-1/src/c/imageProcessing/includes/cvhighgui.h new file mode 100644 index 00000000..cae3dd1b --- /dev/null +++ b/2.3-1/src/c/imageProcessing/includes/cvhighgui.h @@ -0,0 +1,32 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __CVHIGHGUI_H__ +#define __CVHIGHGUI_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include "types.h" +#include "opencv2/core/core.hpp" +#include "opencv2/highgui.hpp" + +IplImage* imcvLoadImages(char *filename, uint8 opentype); +uint8 imcvShowImages(char *winname, IplImage* img); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__CVCORE_H__*/ diff --git a/2.3-1/src/c/imageProcessing/includes/temp.h b/2.3-1/src/c/imageProcessing/includes/temp.h new file mode 100644 index 00000000..1e4c83cb --- /dev/null +++ b/2.3-1/src/c/imageProcessing/includes/temp.h @@ -0,0 +1,11 @@ + /* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ diff --git a/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.h b/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.h new file mode 100644 index 00000000..9d83caac --- /dev/null +++ b/2.3-1/src/c/imageProcessing/interfaces/int_cvcore.h @@ -0,0 +1,31 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __INT_CVCORE_H__ +#define __INT_CVCORE_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include "types.h" + + +#define d0d0g2d0CV_CreateImageim0(width,height,depth,depth_size,no_of_ch) \ + imcvCreateImages(width,height,depth,no_of_ch) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_CVCORE_H__*/ diff --git a/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.h b/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.h new file mode 100644 index 00000000..f08ac40b --- /dev/null +++ b/2.3-1/src/c/imageProcessing/interfaces/int_cvhighgui.h @@ -0,0 +1,34 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __INT_CVHIGHGUI_H__ +#define __INT_CVHIGHGUI_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + +#include "types.h" +#include "opencv2/highgui.hpp" + +#define g2d0CV_LoadImageim0(filename,name_size,loadtype) imcvLoadImages(filename,loadtype) +#define g2im0CV_ShowImageu80(winname,win_size,img) imcvShowImages(winname,img) +#define im0CV_ShowImageu80(img) imcvShowImages("",img) +#define d0CV_WaitKeyu80(delay) cvWaitKey(delay) +#define g2im0CV_SaveImageu80(filename,name_size,img) cvSaveImage(filename,img,NULL) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_CVHIGHGUI_H__*/ diff --git a/2.3-1/src/c/matrixOperations/cat/ccata.c b/2.3-1/src/c/matrixOperations/cat/ccata.c index 88106a87..a6ac6cf0 100644 --- a/2.3-1/src/c/matrixOperations/cat/ccata.c +++ b/2.3-1/src/c/matrixOperations/cat/ccata.c @@ -26,7 +26,7 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { - //out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/matrixOperations/cat/zcata.c b/2.3-1/src/c/matrixOperations/cat/zcata.c index 30d50eea..bfb6e922 100644 --- a/2.3-1/src/c/matrixOperations/cat/zcata.c +++ b/2.3-1/src/c/matrixOperations/cat/zcata.c @@ -26,7 +26,7 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, { for (j = 0 ; j < lines1 ; ++j) { - //out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/matrixOperations/cumprod/dcolumncumproda.c b/2.3-1/src/c/matrixOperations/cumprod/dcolumncumproda.c index 4eec55fc..b64fac48 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/dcolumncumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/dcolumncumproda.c @@ -19,13 +19,13 @@ void dcolumncumproda(double *in1, int row, int column, double *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/drowcumproda.c b/2.3-1/src/c/matrixOperations/cumprod/drowcumproda.c index 80178b26..21082d0c 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/drowcumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/drowcumproda.c @@ -19,12 +19,12 @@ void drowcumproda(double *in1, int row, int column, double *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/i16columncumproda.c b/2.3-1/src/c/matrixOperations/cumprod/i16columncumproda.c index 81604bce..e5af54bb 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/i16columncumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/i16columncumproda.c @@ -19,13 +19,13 @@ void i16columncumproda(int16 *in1, int row, int column, int16 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/i16rowcumproda.c b/2.3-1/src/c/matrixOperations/cumprod/i16rowcumproda.c index 175c8647..0c38b5eb 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/i16rowcumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/i16rowcumproda.c @@ -19,12 +19,12 @@ void i16rowcumproda(int16 *in1, int row, int column, int16 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/i8columncumproda.c b/2.3-1/src/c/matrixOperations/cumprod/i8columncumproda.c index 4a5b45db..cf2156dd 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/i8columncumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/i8columncumproda.c @@ -19,13 +19,13 @@ void i8columncumproda(int8 *in1, int row, int column, int8 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/i8rowcumproda.c b/2.3-1/src/c/matrixOperations/cumprod/i8rowcumproda.c index ac5eebe1..c2ecf199 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/i8rowcumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/i8rowcumproda.c @@ -19,12 +19,12 @@ void i8rowcumproda(int8 *in1, int row, int column, int8 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/scolumncumproda.c b/2.3-1/src/c/matrixOperations/cumprod/scolumncumproda.c index d720eb2e..e97ca903 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/scolumncumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/scolumncumproda.c @@ -19,13 +19,13 @@ void scolumncumproda(float *in1, int row, int column, float *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/srowcumproda.c b/2.3-1/src/c/matrixOperations/cumprod/srowcumproda.c index d2f5db88..cab4e443 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/srowcumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/srowcumproda.c @@ -19,12 +19,12 @@ void srowcumproda(float *in1, int row, int column, float *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/u16columncumproda.c b/2.3-1/src/c/matrixOperations/cumprod/u16columncumproda.c index 3f23bd7e..7b3c2d87 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/u16columncumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/u16columncumproda.c @@ -19,13 +19,13 @@ void u16columncumproda(uint16 *in1, int row, int column, uint16 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/u16rowcumproda.c b/2.3-1/src/c/matrixOperations/cumprod/u16rowcumproda.c index 645c814c..23b452c4 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/u16rowcumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/u16rowcumproda.c @@ -19,12 +19,12 @@ void u16rowcumproda(uint16 *in1, int row, int column, uint16 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/u8columncumproda.c b/2.3-1/src/c/matrixOperations/cumprod/u8columncumproda.c index 7c9a66a1..3a6ee92c 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/u8columncumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/u8columncumproda.c @@ -19,13 +19,13 @@ void u8columncumproda(uint8 *in1, int row, int column, uint8 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumprod/u8rowcumproda.c b/2.3-1/src/c/matrixOperations/cumprod/u8rowcumproda.c index 937d0a4d..61b214c3 100644 --- a/2.3-1/src/c/matrixOperations/cumprod/u8rowcumproda.c +++ b/2.3-1/src/c/matrixOperations/cumprod/u8rowcumproda.c @@ -19,12 +19,12 @@ void u8rowcumproda(uint8 *in1, int row, int column, uint8 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/dcolumncumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/dcolumncumsuma.c index e26a9da5..daf60134 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/dcolumncumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/dcolumncumsuma.c @@ -19,13 +19,13 @@ void dcolumncumsuma(double *in1, int row, int column, double *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/drowcumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/drowcumsuma.c index e523d677..4bb3f320 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/drowcumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/drowcumsuma.c @@ -19,12 +19,12 @@ void drowcumsuma(double *in1, int row, int column, double *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/i16columncumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/i16columncumsuma.c index 8f0dcb5a..ae84428b 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/i16columncumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/i16columncumsuma.c @@ -19,13 +19,13 @@ void i16columncumsuma(int16 *in1, int row, int column, int16 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/i16rowcumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/i16rowcumsuma.c index 9cd98c5c..67cb9c7f 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/i16rowcumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/i16rowcumsuma.c @@ -19,12 +19,12 @@ void i16rowcumsuma(int16 *in1, int row, int column, int16 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/i8columncumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/i8columncumsuma.c index c7030496..67f72bcc 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/i8columncumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/i8columncumsuma.c @@ -19,13 +19,13 @@ void i8columncumsuma(int8 *in1, int row, int column, int8 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/i8rowcumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/i8rowcumsuma.c index 017e920a..a9e7da81 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/i8rowcumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/i8rowcumsuma.c @@ -19,12 +19,12 @@ void i8rowcumsuma(int8 *in1, int row, int column, int8 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/scolumncumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/scolumncumsuma.c index 108c2c7f..a7e8a851 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/scolumncumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/scolumncumsuma.c @@ -19,13 +19,13 @@ void scolumncumsuma(float *in1, int row, int column, float *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/srowcumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/srowcumsuma.c index b5b968f1..3af5d367 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/srowcumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/srowcumsuma.c @@ -19,12 +19,12 @@ void srowcumsuma(float *in1, int row, int column, float *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/u16columncumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/u16columncumsuma.c index 360caeb3..aa16a582 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/u16columncumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/u16columncumsuma.c @@ -19,13 +19,13 @@ void u16columncumsuma(uint16 *in1, int row, int column, uint16 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/u16rowcumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/u16rowcumsuma.c index 75ff1e6c..0ef0945c 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/u16rowcumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/u16rowcumsuma.c @@ -19,12 +19,12 @@ void u16rowcumsuma(uint16 *in1, int row, int column, uint16 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/u8columncumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/u8columncumsuma.c index a53467af..890a0bee 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/u8columncumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/u8columncumsuma.c @@ -19,13 +19,13 @@ void u8columncumsuma(uint8 *in1, int row, int column, uint8 *out) { int row_cnt, col_cnt = 0; - //Assign elements in first column as it is + /*Assign elements in first column as it is*/ for(row_cnt = 0; row_cnt < row; row_cnt++) { out[row_cnt] = in1[row_cnt]; } - //For second column onwards + /*For second column onwards*/ for (row_cnt = 0; row_cnt < row; row_cnt++) { for ( col_cnt = 1; col_cnt < column; col_cnt++) diff --git a/2.3-1/src/c/matrixOperations/cumsum/u8rowcumsuma.c b/2.3-1/src/c/matrixOperations/cumsum/u8rowcumsuma.c index 41553cd5..1204d83e 100644 --- a/2.3-1/src/c/matrixOperations/cumsum/u8rowcumsuma.c +++ b/2.3-1/src/c/matrixOperations/cumsum/u8rowcumsuma.c @@ -19,12 +19,12 @@ void u8rowcumsuma(uint8 *in1, int row, int column, uint8 *out) { int row_cnt, col_cnt = 0; - //assign elements in first row as it is + /*assign elements in first row as it is*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { out[col_cnt*row] = in1[col_cnt*row]; } - //For second row onwards + /*For second row onwards*/ for (col_cnt = 0; col_cnt < column; col_cnt++) { for ( row_cnt = 1; row_cnt < row; row_cnt++) diff --git a/2.3-1/src/c/matrixOperations/diag/ddiaga.c b/2.3-1/src/c/matrixOperations/diag/ddiaga.c index 26363ef9..20f2039e 100644 --- a/2.3-1/src/c/matrixOperations/diag/ddiaga.c +++ b/2.3-1/src/c/matrixOperations/diag/ddiaga.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void ddiaga(double in, int size,int insert_post,double *out) { diff --git a/2.3-1/src/c/matrixOperations/diag/ddiagina.c b/2.3-1/src/c/matrixOperations/diag/ddiagina.c index c4093b2d..de192110 100644 --- a/2.3-1/src/c/matrixOperations/diag/ddiagina.c +++ b/2.3-1/src/c/matrixOperations/diag/ddiagina.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void ddiagina(double *in, int _row,int _column,int insert_post,double *out) { diff --git a/2.3-1/src/c/matrixOperations/diag/i16diaga.c b/2.3-1/src/c/matrixOperations/diag/i16diaga.c index 29f92907..b65822b6 100644 --- a/2.3-1/src/c/matrixOperations/diag/i16diaga.c +++ b/2.3-1/src/c/matrixOperations/diag/i16diaga.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void i16diaga(int16 in, int size,int insert_post,int16 *out) { diff --git a/2.3-1/src/c/matrixOperations/diag/i16diagina.c b/2.3-1/src/c/matrixOperations/diag/i16diagina.c index 518f627c..8a86c237 100644 --- a/2.3-1/src/c/matrixOperations/diag/i16diagina.c +++ b/2.3-1/src/c/matrixOperations/diag/i16diagina.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void i16diagina(int16 *in, int _row,int _column,int insert_post,int16 *out) { int i, j; diff --git a/2.3-1/src/c/matrixOperations/diag/i8diaga.c b/2.3-1/src/c/matrixOperations/diag/i8diaga.c index c41ec9df..50ba76e5 100644 --- a/2.3-1/src/c/matrixOperations/diag/i8diaga.c +++ b/2.3-1/src/c/matrixOperations/diag/i8diaga.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void i8diaga(int8 in, int size,int insert_post,int8 *out) { diff --git a/2.3-1/src/c/matrixOperations/diag/i8diagina.c b/2.3-1/src/c/matrixOperations/diag/i8diagina.c index 77a7e074..eb005bf0 100644 --- a/2.3-1/src/c/matrixOperations/diag/i8diagina.c +++ b/2.3-1/src/c/matrixOperations/diag/i8diagina.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void i8diagina(int8 *in, int _row,int _column,int insert_post,int8 *out) { int i, j; diff --git a/2.3-1/src/c/matrixOperations/diag/u16diaga.c b/2.3-1/src/c/matrixOperations/diag/u16diaga.c index 90a10536..18ff1bf9 100644 --- a/2.3-1/src/c/matrixOperations/diag/u16diaga.c +++ b/2.3-1/src/c/matrixOperations/diag/u16diaga.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void u16diaga(uint16 in, int size,int insert_post,uint16 *out) { diff --git a/2.3-1/src/c/matrixOperations/diag/u16diagina.c b/2.3-1/src/c/matrixOperations/diag/u16diagina.c index f5dc6f99..02b52ece 100644 --- a/2.3-1/src/c/matrixOperations/diag/u16diagina.c +++ b/2.3-1/src/c/matrixOperations/diag/u16diagina.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void u16diagina(uint16 *in, int _row,int _column,int insert_post,uint16 *out) { int i, j; diff --git a/2.3-1/src/c/matrixOperations/diag/u8diaga.c b/2.3-1/src/c/matrixOperations/diag/u8diaga.c index 05a03ba2..079e4823 100644 --- a/2.3-1/src/c/matrixOperations/diag/u8diaga.c +++ b/2.3-1/src/c/matrixOperations/diag/u8diaga.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void u8diaga(uint8 in, int size,int insert_post,uint8 *out) { diff --git a/2.3-1/src/c/matrixOperations/diag/u8diagina.c b/2.3-1/src/c/matrixOperations/diag/u8diagina.c index bea24655..c9bf12ed 100644 --- a/2.3-1/src/c/matrixOperations/diag/u8diagina.c +++ b/2.3-1/src/c/matrixOperations/diag/u8diagina.c @@ -11,7 +11,7 @@ */ #include "diag.h" -#include<stdlib.h> // Used for Absolute value of insert_post + void u8diagina(uint8 *in, int _row,int _column,int insert_post,uint8 *out) { int i, j; diff --git a/2.3-1/src/c/matrixOperations/flipdim/dflipdima.c b/2.3-1/src/c/matrixOperations/flipdim/dflipdima.c index 95eabc9f..b510c445 100644 --- a/2.3-1/src/c/matrixOperations/flipdim/dflipdima.c +++ b/2.3-1/src/c/matrixOperations/flipdim/dflipdima.c @@ -1,22 +1,23 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE -//Function flips the input matrix along given dimension + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function flips the input matrix along given dimension*/ #include "flipdim.h" void dflipdima (double *in, int row, int col, int dim, int blk_size, double *out) { int col_count = 0, row_count = 0, blk_count = 0, count = 0; - if(dim == 1) //flip rows + if(dim == 1) /*flip rows*/ { if(blk_size == 1) { @@ -28,7 +29,7 @@ void dflipdima (double *in, int row, int col, int dim, int blk_size, double *out } } } - else //block size is more than 1 + else /*block size is more than 1*/ { for(col_count = 0; col_count < col; col_count++) { @@ -47,7 +48,7 @@ void dflipdima (double *in, int row, int col, int dim, int blk_size, double *out } } - else if(dim == 2) //flip columns + else if(dim == 2) /*flip columns*/ { if(blk_size == 1) { diff --git a/2.3-1/src/c/matrixOperations/flipdim/i16flipdima.c b/2.3-1/src/c/matrixOperations/flipdim/i16flipdima.c index 281b39eb..eb51221f 100644 --- a/2.3-1/src/c/matrixOperations/flipdim/i16flipdima.c +++ b/2.3-1/src/c/matrixOperations/flipdim/i16flipdima.c @@ -1,22 +1,23 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE -//Function flips the input matrix along given dimension + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function flips the input matrix along given dimension*/ #include "flipdim.h" void i16flipdima (int16 *in, int row, int col, int dim, int blk_size, int16 *out) { int col_count = 0, row_count = 0, blk_count = 0, count = 0; - if(dim == 1) //flip rows + if(dim == 1) /*flip rows*/ { if(blk_size == 1) { @@ -28,7 +29,7 @@ void i16flipdima (int16 *in, int row, int col, int dim, int blk_size, int16 *out } } } - else //block size is more than 1 + else /*block size is more than 1*/ { for(col_count = 0; col_count < col; col_count++) { @@ -47,7 +48,7 @@ void i16flipdima (int16 *in, int row, int col, int dim, int blk_size, int16 *out } } - else if(dim == 2) //flip columns + else if(dim == 2) /*flip columns*/ { if(blk_size == 1) { diff --git a/2.3-1/src/c/matrixOperations/flipdim/i8flipdima.c b/2.3-1/src/c/matrixOperations/flipdim/i8flipdima.c index fc302cb7..1c23a5ea 100644 --- a/2.3-1/src/c/matrixOperations/flipdim/i8flipdima.c +++ b/2.3-1/src/c/matrixOperations/flipdim/i8flipdima.c @@ -1,22 +1,23 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE -//Function flips the input matrix along given dimension + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function flips the input matrix along given dimension*/ #include "flipdim.h" void i8flipdima (int8 *in, int row, int col, int dim, int blk_size, int8 *out) { int col_count = 0, row_count = 0, blk_count = 0, count = 0; - if(dim == 1) //flip rows + if(dim == 1) /*flip rows*/ { if(blk_size == 1) { @@ -28,7 +29,7 @@ void i8flipdima (int8 *in, int row, int col, int dim, int blk_size, int8 *out) } } } - else //block size is more than 1 + else /*block size is more than 1*/ { for(col_count = 0; col_count < col; col_count++) { @@ -47,7 +48,7 @@ void i8flipdima (int8 *in, int row, int col, int dim, int blk_size, int8 *out) } } - else if(dim == 2) //flip columns + else if(dim == 2) /*flip columns*/ { if(blk_size == 1) { diff --git a/2.3-1/src/c/matrixOperations/flipdim/sflipdima.c b/2.3-1/src/c/matrixOperations/flipdim/sflipdima.c index 588a72ba..85746996 100644 --- a/2.3-1/src/c/matrixOperations/flipdim/sflipdima.c +++ b/2.3-1/src/c/matrixOperations/flipdim/sflipdima.c @@ -1,22 +1,23 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE -//Function flips the input matrix along given dimension + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function flips the input matrix along given dimension*/ #include "flipdim.h" void sflipdima (float *in, int row, int col, int dim, int blk_size, float *out) { int col_count = 0, row_count = 0, blk_count = 0, count = 0; - if(dim == 1) //flip rows + if(dim == 1) /*flip rows*/ { if(blk_size == 1) { @@ -28,7 +29,7 @@ void sflipdima (float *in, int row, int col, int dim, int blk_size, float *out) } } } - else //block size is more than 1 + else /*block size is more than 1*/ { for(col_count = 0; col_count < col; col_count++) { @@ -47,7 +48,7 @@ void sflipdima (float *in, int row, int col, int dim, int blk_size, float *out) } } - else if(dim == 2) //flip columns + else if(dim == 2) /*flip columns*/ { if(blk_size == 1) { diff --git a/2.3-1/src/c/matrixOperations/flipdim/u16flipdima.c b/2.3-1/src/c/matrixOperations/flipdim/u16flipdima.c index fc1941e9..3689b944 100644 --- a/2.3-1/src/c/matrixOperations/flipdim/u16flipdima.c +++ b/2.3-1/src/c/matrixOperations/flipdim/u16flipdima.c @@ -1,22 +1,23 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE -//Function flips the input matrix along given dimension + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/*Function flips the input matrix along given dimension*/ #include "flipdim.h" void u16flipdima (uint16 *in, int row, int col, int dim, int blk_size, uint16 *out) { int col_count = 0, row_count = 0, blk_count = 0, count = 0; - if(dim == 1) //flip rows + if(dim == 1) /*flip rows*/ { if(blk_size == 1) { @@ -28,7 +29,7 @@ void u16flipdima (uint16 *in, int row, int col, int dim, int blk_size, uint16 *o } } } - else //block size is more than 1 + else /*block size is more than 1*/ { for(col_count = 0; col_count < col; col_count++) { @@ -47,7 +48,7 @@ void u16flipdima (uint16 *in, int row, int col, int dim, int blk_size, uint16 *o } } - else if(dim == 2) //flip columns + else if(dim == 2) /*flip columns*/ { if(blk_size == 1) { diff --git a/2.3-1/src/c/matrixOperations/flipdim/u8flipdima.c b/2.3-1/src/c/matrixOperations/flipdim/u8flipdima.c index 61b81777..bae8c12f 100644 --- a/2.3-1/src/c/matrixOperations/flipdim/u8flipdima.c +++ b/2.3-1/src/c/matrixOperations/flipdim/u8flipdima.c @@ -1,22 +1,22 @@ -// Copyright (C) 2016 - IIT Bombay - FOSSEE -// -// This file must be used under the terms of the CeCILL. -// This source file is licensed as described in the file COPYING, which -// you should have received as part of this distribution. The terms -// are also available at -// http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -// Author: Siddhesh Wani -// Organization: FOSSEE, IIT Bombay -// Email: toolbox@scilab.in +/* Copyright (C) 2016 - IIT Bombay - FOSSEE -//Function flips the input matrix along given dimension + This file must be used under the terms of the CeCILL. + This source file is licensed as described in the file COPYING, which + you should have received as part of this distribution. The terms + are also available at + http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + Author: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ +/*Function flips the input matrix along given dimension*/ #include "flipdim.h" void u8flipdima (uint8 *in, int row, int col, int dim, int blk_size, uint8 *out) { int col_count = 0, row_count = 0, blk_count = 0, count = 0; - if(dim == 1) //flip rows + if(dim == 1) /*flip rows*/ { if(blk_size == 1) { @@ -28,7 +28,7 @@ void u8flipdima (uint8 *in, int row, int col, int dim, int blk_size, uint8 *out) } } } - else //block size is more than 1 + else /*block size is more than 1*/ { for(col_count = 0; col_count < col; col_count++) { @@ -47,7 +47,7 @@ void u8flipdima (uint8 *in, int row, int col, int dim, int blk_size, uint8 *out) } } - else if(dim == 2) //flip columns + else if(dim == 2) /*flip columns*/ { if(blk_size == 1) { diff --git a/2.3-1/src/c/matrixOperations/includes/diag.h b/2.3-1/src/c/matrixOperations/includes/diag.h index 24c167af..b255c4be 100644 --- a/2.3-1/src/c/matrixOperations/includes/diag.h +++ b/2.3-1/src/c/matrixOperations/includes/diag.h @@ -15,7 +15,8 @@ #include "dynlib_matrixoperations.h" #include "types.h" - +#include <stdlib.h> + #ifdef __cplusplus extern "C" { #endif diff --git a/2.3-1/src/c/matrixOperations/kron/dkrona.c b/2.3-1/src/c/matrixOperations/kron/dkrona.c index 6da6ed59..31e0a52e 100644 --- a/2.3-1/src/c/matrixOperations/kron/dkrona.c +++ b/2.3-1/src/c/matrixOperations/kron/dkrona.c @@ -18,7 +18,7 @@ void dkrona (double *in1, int row1, int col1, double *in2, int row2, \ int col2, double *out) { int row1_count, col1_count,row2_count, col2_count; - int row = row1*row2, col = col1*col2; + int row = row1*row2; int temp = 0; for(col1_count = 0;col1_count < col1; col1_count++) diff --git a/2.3-1/src/c/matrixOperations/kron/skrona.c b/2.3-1/src/c/matrixOperations/kron/skrona.c index 7b154fed..1e0daaf1 100644 --- a/2.3-1/src/c/matrixOperations/kron/skrona.c +++ b/2.3-1/src/c/matrixOperations/kron/skrona.c @@ -18,7 +18,7 @@ void skrona (float *in1, int row1, int col1, float *in2, int row2, \ int col2, float *out) { int row1_count, col1_count,row2_count, col2_count; - int row = row1*row2, col = col1*col2; + int row = row1*row2; int temp = 0; for(col1_count = 0;col1_count < col1; col1_count++) diff --git a/2.3-1/src/c/matrixOperations/multiplication/i16mulma.c b/2.3-1/src/c/matrixOperations/multiplication/i16mulma.c index ee1268a4..b6b882d3 100644 --- a/2.3-1/src/c/matrixOperations/multiplication/i16mulma.c +++ b/2.3-1/src/c/matrixOperations/multiplication/i16mulma.c @@ -11,7 +11,7 @@ ** \param out : Matrix that contains the multiplication in1 * in2. */ -// dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed +/* dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed*/ #include "matrixMultiplication.h" diff --git a/2.3-1/src/c/matrixOperations/multiplication/i8mulma.c b/2.3-1/src/c/matrixOperations/multiplication/i8mulma.c index 0efe797e..4fdb203f 100644 --- a/2.3-1/src/c/matrixOperations/multiplication/i8mulma.c +++ b/2.3-1/src/c/matrixOperations/multiplication/i8mulma.c @@ -11,7 +11,7 @@ ** \param out : Matrix that contains the multiplication in1 * in2. */ -// dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed +/* dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed*/ #include "matrixMultiplication.h" diff --git a/2.3-1/src/c/matrixOperations/multiplication/u16mulma.c b/2.3-1/src/c/matrixOperations/multiplication/u16mulma.c index a36c57c7..11f88d89 100644 --- a/2.3-1/src/c/matrixOperations/multiplication/u16mulma.c +++ b/2.3-1/src/c/matrixOperations/multiplication/u16mulma.c @@ -11,7 +11,7 @@ ** \param out : Matrix that contains the multiplication in1 * in2. */ -// dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed +/* dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed*/ #include "matrixMultiplication.h" diff --git a/2.3-1/src/c/matrixOperations/multiplication/u8mulma.c b/2.3-1/src/c/matrixOperations/multiplication/u8mulma.c index ea630b6f..3660249d 100644 --- a/2.3-1/src/c/matrixOperations/multiplication/u8mulma.c +++ b/2.3-1/src/c/matrixOperations/multiplication/u8mulma.c @@ -12,7 +12,7 @@ */ -// dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed +/* dgemm function of lapack library does not support uint8,uint16,int8 and int16 datatype so removed*/ #include "matrixMultiplication.h" diff --git a/2.3-1/src/c/operations/interfaces/int_OpStar.h b/2.3-1/src/c/operations/interfaces/int_OpStar.h index f899a29e..78697b3e 100644 --- a/2.3-1/src/c/operations/interfaces/int_OpStar.h +++ b/2.3-1/src/c/operations/interfaces/int_OpStar.h @@ -35,41 +35,41 @@ #define u80u80OpStaru80(in1,in2) u8muls(in1, in2) -//#define u80u80OpStaru160(in1,in2) (uint16)(in1 * in2) +#define u80u80OpStaru160(in1,in2) (uint16)(in1 * in2) -//#define u80i80OpStari80(in1,in2) (int8)(in1 * in2) +#define u80i80OpStari80(in1,in2) (int8)(in1 * in2) -//#define u80i80OpStari160(in1,in2) (int16)(in1 * in2) +#define u80i80OpStari160(in1,in2) (int16)(in1 * in2) -//#define u80u160OpStaru160(in1,in2) (uint16)(in1 * in2) +#define u80u160OpStaru160(in1,in2) (uint16)(in1 * in2) -//#define u80i160OpStari160(in1,in2) (int16)(in1 * in2) +#define u80i160OpStari160(in1,in2) (int16)(in1 * in2) -//#define i80u80OpStari80(in1,in2) (int8)(in1 * in2) +#define i80u80OpStari80(in1,in2) (int8)(in1 * in2) -//#define i80u80OpStari160(in1,in2) (int16)(in1 * in2) +#define i80u80OpStari160(in1,in2) (int16)(in1 * in2) #define i80i80OpStari80(in1,in2) (int8)(in1 , in2) -//#define i80i80OpStari160(in1,in2) (int16)(in1 * in2) +#define i80i80OpStari160(in1,in2) (int16)(in1 * in2) -//#define i80u160OpStari160(in1,in2) (int16)(in1 * in2) +#define i80u160OpStari160(in1,in2) (int16)(in1 * in2) -//#define i80i160OpStari160(in1,in2) (int16)(in1 * in2) +#define i80i160OpStari160(in1,in2) (int16)(in1 * in2) -//#define u160u80OpStaru160(in1,in2) (uint16)(in1 * in2) +#define u160u80OpStaru160(in1,in2) (uint16)(in1 * in2) -//#define u160i80OpStari160(in1,in2) (int16)(in1 * in2) +#define u160i80OpStari160(in1,in2) (int16)(in1 * in2) #define u160u160OpStaru160(in1,in2) u16muls(in1 , in2) -//#define u160i160OpStari160(in1,in2) (int16)(in1 * in2) +#define u160i160OpStari160(in1,in2) (int16)(in1 * in2) -//#define i160u80OpStari160(in1,in2) (int16)(in1 * in2) +#define i160u80OpStari160(in1,in2) (int16)(in1 * in2) -//#define i160i80OpStari160(in1,in2) (int16)(in1 * in2) +#define i160i80OpStari160(in1,in2) (int16)(in1 * in2) -//#define i160u160OpStari160(in1,in2) (int16)(in1 * in2) +#define i160u160OpStari160(in1,in2) (int16)(in1 * in2) #define i160i160OpStari160(in1,in2) i16muls(in1 , in2) diff --git a/2.3-1/src/c/statisticsFunctions/includes/statMax.h b/2.3-1/src/c/statisticsFunctions/includes/statMax.h index 7ac659ce..c3f19099 100644 --- a/2.3-1/src/c/statisticsFunctions/includes/statMax.h +++ b/2.3-1/src/c/statisticsFunctions/includes/statMax.h @@ -12,8 +12,7 @@ #ifndef __STAT_MAX_H__ #define __STAT_MAX_H__ -//#ifndef __MAX_H__ -//#define __MAX_H__ + #include "dynlib_statisticsfunctions.h" #include "types.h" diff --git a/2.3-1/src/c/statisticsFunctions/includes/statMin.h b/2.3-1/src/c/statisticsFunctions/includes/statMin.h index 4381abd1..ac732852 100644 --- a/2.3-1/src/c/statisticsFunctions/includes/statMin.h +++ b/2.3-1/src/c/statisticsFunctions/includes/statMin.h @@ -12,8 +12,7 @@ #ifndef __STAT_MIN_H__ #define __STAT_MIN_H__ -//#ifndef __MIN_H__ -//#define __MIN_H__ + #include "dynlib_statisticsfunctions.h" #include "types.h" diff --git a/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c index e66422a2..ec717778 100644 --- a/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/dcolumnmaxa.c @@ -11,7 +11,6 @@ */ #include "statMax.h" -//#include "max.h" void dcolumnmaxa(double *in, int rows, int columns, double* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/dmaxa.c b/2.3-1/src/c/statisticsFunctions/max/dmaxa.c index 63644635..7292f3cd 100644 --- a/2.3-1/src/c/statisticsFunctions/max/dmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/dmaxa.c @@ -11,7 +11,7 @@ */ #include "statMax.h" -//#include "max.h" + double dmaxa(double *in, int size) { double out = in[0]; int i = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c b/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c index db0c72c0..596c535f 100644 --- a/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/drowmaxa.c @@ -11,7 +11,7 @@ */ #include "statMax.h" -//#include "max.h" + void drowmaxa(double *in, int rows, int columns, double* out) { int i = 0, j = 0; for (i = 0; i < columns; i++) diff --git a/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c index 94c5cf6a..a3af3a4a 100644 --- a/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/i16columnmaxa.c @@ -11,7 +11,7 @@ */ #include "statMax.h" -//#include "max.h" + void i16columnmaxa(int16 *in, int rows, int columns, int16* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/i16maxa.c b/2.3-1/src/c/statisticsFunctions/max/i16maxa.c index c1294193..515071d0 100644 --- a/2.3-1/src/c/statisticsFunctions/max/i16maxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/i16maxa.c @@ -11,7 +11,7 @@ */ #include "statMax.h" -//#include "max.h" + int16 i16maxa(int16 *in, int size) { int16 out = in[0]; int i = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c b/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c index 263e56ca..317942e8 100644 --- a/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/i16rowmaxa.c @@ -11,7 +11,6 @@ */ #include "statMax.h" -//#include "max.h" void i16rowmaxa(int16 *in, int rows, int columns, int16* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c index 9c214dbb..0d46f782 100644 --- a/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/i8columnmaxa.c @@ -11,7 +11,6 @@ */ #include "statMax.h" -//#include "max.h" void i8columnmaxa(int8 *in, int rows, int columns, int8* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/i8maxa.c b/2.3-1/src/c/statisticsFunctions/max/i8maxa.c index 67fd3358..bccb8575 100644 --- a/2.3-1/src/c/statisticsFunctions/max/i8maxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/i8maxa.c @@ -10,7 +10,6 @@ * */ #include "statMax.h" -//#include "max.h" int8 i8maxa(int8 *in, int size) { int8 out = in[0]; diff --git a/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c b/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c index a6d15aa3..44ca17a5 100644 --- a/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/i8rowmaxa.c @@ -11,7 +11,6 @@ */ #include "statMax.h" -//#include "max.h" void i8rowmaxa(int8 *in, int rows, int columns, int8* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c index 4014f88a..185ab985 100644 --- a/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/scolumnmaxa.c @@ -11,7 +11,6 @@ */ #include "statMax.h" -//#include "max.h" void scolumnmaxa(float *in, int rows, int columns, float* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/smaxa.c b/2.3-1/src/c/statisticsFunctions/max/smaxa.c index 03b4cf18..3410faea 100644 --- a/2.3-1/src/c/statisticsFunctions/max/smaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/smaxa.c @@ -10,7 +10,7 @@ * */ #include "statMax.h" -//#include "max.h" + float smaxa(float *in, int size) { float out = in[0]; diff --git a/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c b/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c index ea6c33d6..8f3b30ee 100644 --- a/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/srowmaxa.c @@ -10,7 +10,7 @@ * */ #include "statMax.h" -//#include "max.h" + void srowmaxa(float *in, int rows, int columns, float* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c index e0ccb3ae..91f950df 100644 --- a/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/u16columnmaxa.c @@ -12,8 +12,6 @@ #include "statMax.h" -//#include "max.h" - void u16columnmaxa(uint16 *in, int rows, int columns, uint16* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/u16maxa.c b/2.3-1/src/c/statisticsFunctions/max/u16maxa.c index c3af84f6..5c1b1360 100644 --- a/2.3-1/src/c/statisticsFunctions/max/u16maxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/u16maxa.c @@ -10,7 +10,6 @@ * */ #include "statMax.h" -//#include "max.h" uint16 u16maxa(uint16 *in, int size) { uint16 out = in[0]; diff --git a/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c b/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c index cef61f1d..c3b89179 100644 --- a/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/u16rowmaxa.c @@ -10,8 +10,6 @@ * */ #include "statMax.h" -//#include <stdlib.h> -//#include "max.h" void u16rowmaxa(uint16 *in, int rows, int columns, uint16* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c b/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c index 222bc291..fb90ae35 100644 --- a/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/u8columnmaxa.c @@ -10,7 +10,7 @@ * */ #include "statMax.h" -//#include "max.h" + void u8columnmaxa(uint8 *in, int rows, int columns, uint8* out) { int i = 0, j = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/u8maxa.c b/2.3-1/src/c/statisticsFunctions/max/u8maxa.c index 3e599150..51e0dea5 100644 --- a/2.3-1/src/c/statisticsFunctions/max/u8maxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/u8maxa.c @@ -11,7 +11,7 @@ */ #include "statMax.h" -//#include "max.h" + uint8 u8maxa(uint8 *in, int size) { uint8 out = in[0]; int i = 0; diff --git a/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c b/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c index fda293c7..57c62f4d 100644 --- a/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c +++ b/2.3-1/src/c/statisticsFunctions/max/u8rowmaxa.c @@ -10,7 +10,7 @@ * */ #include "statMax.h" -//#include "max.h" + void u8rowmaxa(uint8 *in, int rows, int columns, uint8* out) { int i = 0, j = 0; |