Skip to content

Commit 158d4ad

Browse files
authored
Merge branch 'master' into master
2 parents 894c78e + 8b0cf07 commit 158d4ad

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4757
-317
lines changed

CMakeLists.txt

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,9 @@ add_subdirectory(TMOCmd/)
2828
#add_subdirectory(TMOZhao10/)
2929
#add_subdirectory(TMOMM16/) #Martin Molek
3030
#add_subdirectory(TMOAlsam06/) #Jiri Zverina
31-
#add_subdirectory(TMOAlsam09/) #Martin Molek
32-
#add_subdirectory(TMOAncuti16/) #Vladimir Vlkovic
31+
add_subdirectory(TMOAlsam09/) #Martin Molek
32+
add_subdirectory(TMOAncuti16/) #Vladimir Vlkovic
33+
add_subdirectory(TMOAncuti19/) #Lucie Svobodova
3334
#add_subdirectory(TMOCheryl11/) #Vaclav Chvila
3435
#add_subdirectory(TMOFarbman08/) #Tomas Hudziec
3536
#add_subdirectory(TMOAubry14/) #Tomas Hudziec
@@ -45,12 +46,14 @@ add_subdirectory(TMOChen05/) #Matus Bicanovsky
4546
#add_subdirectory(TMOMantiuk08/) #Matus Bicanovsky
4647
add_subdirectory(TMOAncuti10/) #Matus Bicanovsky
4748
add_subdirectory(TMOSong14/) #Matus Bicanovsky
48-
add_subdirectory(TMOTao18/) #Matus Bicanovsky
49+
#add_subdirectory(TMOTao18/) #Matus Bicanovsky - not working
4950
add_subdirectory(TMOQueiroz06/) #Peter Zdravecký
5051
add_subdirectory(TMOAlsam20/) #Peter Zdravecký
51-
add_subdirectory(TMOLiu15/) #Peter Zdravecký
52-
add_subdirectory(TMOLiu17/) #Peter Zdravecký
52+
#add_subdirectory(TMOLiu15/) #Peter Zdravecký
53+
#add_subdirectory(TMOLiu17/) #Peter Zdravecký
5354
add_subdirectory(TMOLiu16/) #Jakub Krystufek
55+
add_subdirectory(TMOAncuti11/) #Matus Bicanovsky
56+
add_subdirectory(TMOHsin11/) #Matus Bicanovsky
5457
#add_subdirectory(TMOYourOperatorNameLinux/)
5558
#add_subdirectory(TMOJin14/) #
5659
#add_subdirectory(TMOLee10/) #Martin Molek
@@ -62,7 +65,7 @@ add_subdirectory(TMOLiu16/) #Jakub Krystufek
6265
#add_subdirectory(TMOXiong17/) #Filip Brezna: method 1
6366
#add_subdirectory(TMOZhongping15/) #Filip Brezna: method 2
6467
#add_subdirectory(TMOJin17/) #Filip Brezna: method 3
65-
#add_subdirectory(TMOHu14/) #Vladimir Vlkovic
68+
add_subdirectory(TMOHu14/) #Vladimir Vlkovic
6669
#add_subdirectory(TMOTao17/) #Vladimir Vlkovic not ready
6770
#add_subdirectory(TMOSon14/) #Sedlar Pavel, Tomas Hudziec
6871
#add_subdirectory(TMOCLAHE/) #Sedlar Pavel
@@ -72,12 +75,16 @@ add_subdirectory(TMOLiu16/) #Jakub Krystufek
7275
#add_subdirectory(TMONguy15/) #Matej Valek
7376
#add_subdirectory(TMOWu24/) #Filip Sapak
7477
#add_subdirectory(TMOWu24_2/) #Branislav Dubec
75-
#add_subdirectory(TMONafchi17) #Tomas Krivanek
76-
#add_subdirectory(TMONafchi17_2/) #Boris Strbak
78+
add_subdirectory(TMONafchi17) #Tomas Krivanek
79+
add_subdirectory(TMONafchi17_2/) #Boris Strbak
80+
add_subdirectory(TMOMikamo14/) #Jan Findra
81+
add_subdirectory(TMOSlomp12/) #Jan Findra
82+
add_subdirectory(TMOThompson02/) #Jan Findra
83+
add_subdirectory(TMOKhan20/) #Milan Tichavský
7784
add_subdirectory(TMOAmbalathankandy21/) #Ludmila Krejcova
78-
add_subdirectory(TMOYu21/) #Ludmila Krejcova
79-
add_subdirectory(TMOZhang08/) #Ludmila Krejcova
80-
add_subdirectory(TMOHafner16/) #Ludmila Krejcova
85+
add_subdirectory(TMOYu21/) #Ludmila Krejcova
86+
add_subdirectory(TMOZhang08/) #Ludmila Krejcova
87+
add_subdirectory(TMOHafner16/) #Ludmila Krejcova
8188

8289
INSTALL(FILES tmolib/libtmo.so DESTINATION lib)
8390
INSTALL(FILES TMOgui/tmogui PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION . )

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@ Tone Mapping Studio (TMS)
33

44
2004 - 2024, Martin Cadik ([email protected], http://cadik.posvete.cz/)
55

6-
developers: Ondrej Hajdok, Martin Cadik, Michal Augustyn, Ondrej Fialka, Antonin Lejsek, Petr Bilek, Ondrej Pecina, Pavel Fryz, Martin Molek, Vladimir Vlkovic, Jan Brida, Petr Pospisil, Tomas Chlubna, Filip Brezna, Tomas Hudziec, Vaclav Chvila, Jan Kohut, Jan Jedlicka, Michal Vlnas, Matej Valek, Lucie Smiskova, David Chocholaty, Matus Bicanovsky, Filip Sapak, Branislav Dubec, Peter Zdravecky, Jakub Krystufek, Boris Strbak
6+
developers: Ondrej Hajdok, Martin Cadik, Michal Augustyn, Ondrej Fialka, Antonin Lejsek, Petr Bilek, Ondrej Pecina, Pavel Fryz, Martin Molek, Vladimir Vlkovic, Jan Brida, Petr Pospisil, Tomas Chlubna, Filip Brezna, Tomas Hudziec, Vaclav Chvila, Jan Kohut, Jan Jedlicka, Michal Vlnas, Matej Valek, Lucie Smiskova, David Chocholaty, Matus Bicanovsky, Filip Sapak, Branislav Dubec, Peter Zdravecky, Jakub Krystufek, Boris Strbak, Lucie Svobodova, Jan Findra, Milan Tichavsky
7+
78

89

910
About

TMOAncuti10/CMakeLists.txt:Zone.Identifier

Whitespace-only changes.

0 commit comments

Comments
 (0)