From 1a0d2f36d2c306b3a01266f8b8a146e48333d231 Mon Sep 17 00:00:00 2001 From: cyliang368 Date: Fri, 14 Jun 2024 14:11:58 +0200 Subject: [PATCH] Revert "remove unused lines" This reverts commit 2900f1a2cbc7057c8d8c600b66612c7fb8403752. --- raster/r.texture/Makefile | 4 +++- raster/r.texture/h_measure.h | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/raster/r.texture/Makefile b/raster/r.texture/Makefile index a3ceebba2b7..94c584e9ff4 100644 --- a/raster/r.texture/Makefile +++ b/raster/r.texture/Makefile @@ -2,8 +2,10 @@ MODULE_TOPDIR = ../.. PGM = r.texture -LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) +LIBES = $(RASTERLIB) $(GISLIB) $(MATHLIB) $(OPENMP_LIBPATH) $(OPENMP_LIB) DEPENDENCIES = $(RASTERDEP) $(GISDEP) +EXTRA_CFLAGS = $(OPENMP_CFLAGS) +EXTRA_INC = $(OPENMP_INCPATH) include $(MODULE_TOPDIR)/include/Make/Module.make diff --git a/raster/r.texture/h_measure.h b/raster/r.texture/h_measure.h index 5a759b4ec72..790dd76af1b 100644 --- a/raster/r.texture/h_measure.h +++ b/raster/r.texture/h_measure.h @@ -23,6 +23,21 @@ #include "matvec.h" +#define BL "Direction " +#define F1 "Angular Second Moment " +#define F2 "Contrast " +#define F3 "Correlation " +#define F4 "Variance " +#define F5 "Inverse Diff Moment " +#define F6 "Sum Average " +#define F7 "Sum Variance " +#define F8 "Sum Entropy " +#define F9 "Entropy " +#define F10 "Difference Variance " +#define F11 "Difference Entropy " +#define F12 "Measure of Correlation-1 " +#define F13 "Measure of Correlation-2 " + typedef struct menu { char *name; /* measure name */ char *desc; /* menu display - full description */